Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ibus-rime for openSUSE:Factory checked in at 2021-01-20 18:27:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-rime (Old) and /work/SRC/openSUSE:Factory/.ibus-rime.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-rime" Wed Jan 20 18:27:28 2021 rev:16 rq:864491 version:1.4.1~git20201204.bfabe67 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-rime/ibus-rime.changes 2020-11-11 20:47:16.311696562 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-rime.new.28504/ibus-rime.changes 2021-01-20 18:27:56.703546366 +0100 @@ -1,0 +2,13 @@ +Tue Jan 19 23:59:31 UTC 2021 - Dingzhong Chen <[email protected]> + +- Update to version 1.4.1~git20201204.bfabe67: + * Delete install.sh + * Delete install-static.sh + * build: Substitute paths in rime.xml + * build: Use CMake???s install manifest for uninstallation detection + * build: Move install logic to CMake + * docs(README.md): clarify license +- Remove Requires: brise, since it has been deprecated upstream + and already recommended by librime + +------------------------------------------------------------------- Old: ---- ibus-rime-1.4.1~git20200712.33b2755.tar.xz New: ---- ibus-rime-1.4.1~git20201204.bfabe67.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-rime.spec ++++++ --- /var/tmp/diff_new_pack.EiBYEu/_old 2021-01-20 18:27:57.335546945 +0100 +++ /var/tmp/diff_new_pack.EiBYEu/_new 2021-01-20 18:27:57.339546948 +0100 @@ -17,7 +17,7 @@ Name: ibus-rime -Version: 1.4.1~git20200712.33b2755 +Version: 1.4.1~git20201204.bfabe67 Release: 0 Summary: Rime for Linux/IBus License: GPL-3.0-or-later @@ -37,7 +37,6 @@ BuildRequires: libnotify-devel BuildRequires: librime-devel >= 1.0 BuildRequires: opencc-devel -Requires: brise Requires: rime %description ++++++ ibus-rime-1.4.1~git20200712.33b2755.tar.xz -> ibus-rime-1.4.1~git20201204.bfabe67.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/CMakeLists.txt new/ibus-rime-1.4.1~git20201204.bfabe67/CMakeLists.txt --- old/ibus-rime-1.4.1~git20200712.33b2755/CMakeLists.txt 2020-07-12 09:30:51.000000000 +0200 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/CMakeLists.txt 2020-12-04 06:29:18.000000000 +0100 @@ -3,6 +3,8 @@ option(BUILD_STATIC "Build Rime using static libraries" OFF) +include(GNUInstallDirs) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) include(${CMAKE_ROOT}/Modules/FindPkgConfig.cmake) @@ -29,8 +31,16 @@ message(STATUS "Precompiler macro RIME_DATA_DIR is set to \"${RIME_DATA_DIR}\"") add_definitions(-DRIME_DATA_DIR="${RIME_DATA_DIR}") +set(IBUS_RIME_ICONS_DIR "${CMAKE_INSTALL_FULL_DATADIR}/ibus-rime/icons") +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/rime_config.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/rime_config.h" + @ONLY) + set(RIME_DEPS "dl") +include_directories("${CMAKE_CURRENT_BINARY_DIR}") + if(BUILD_STATIC) find_package(ICU REQUIRED uc) if(ICU_FOUND) @@ -46,3 +56,13 @@ aux_source_directory(. IBUS_RIME_SRC) add_executable(ibus-engine-rime ${IBUS_RIME_SRC}) target_link_libraries(ibus-engine-rime ${IBus_LIBRARIES} ${LIBNOTIFY_LIBRARIES} ${Rime_LIBRARIES} ${RIME_DEPS}) + +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/rime.xml.in" + "${CMAKE_CURRENT_BINARY_DIR}/rime.xml" + @ONLY) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rime.xml" DESTINATION "${CMAKE_INSTALL_DATADIR}/ibus/component") +install(TARGETS ibus-engine-rime DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/ibus-rime") +install(DIRECTORY icons DESTINATION "${CMAKE_INSTALL_DATADIR}/ibus-rime" FILES_MATCHING PATTERN "*.png") +install(FILES ibus_rime.yaml DESTINATION "${CMAKE_INSTALL_DATADIR}/rime-data") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/Makefile new/ibus-rime-1.4.1~git20201204.bfabe67/Makefile --- old/ibus-rime-1.4.1~git20200712.33b2755/Makefile 2020-07-12 09:30:51.000000000 +0200 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/Makefile 2020-12-04 06:29:18.000000000 +0100 @@ -1,8 +1,8 @@ ifeq (${PREFIX},) PREFIX=/usr endif -sharedir = $(DESTDIR)$(PREFIX)/share -libexecdir = $(DESTDIR)$(PREFIX)/lib +sharedir = $(PREFIX)/share +libexecdir = $(PREFIX)/lib ifeq (${builddir},) builddir=build @@ -12,30 +12,19 @@ ibus-engine-rime: mkdir -p $(builddir) - (cd $(builddir); cmake -DCMAKE_BUILD_TYPE=Release .. && make) + (cd $(builddir); cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=$(sharedir) -DCMAKE_INSTALL_LIBEXECDIR=$(libexecdir) .. && make) @echo ':)' ibus-engine-rime-static: mkdir -p $(builddir) - (cd $(builddir); cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON .. && make) + (cd $(builddir); cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_DATADIR=$(sharedir) -DCMAKE_INSTALL_LIBEXECDIR=$(libexecdir) -DBUILD_STATIC=ON .. && make) @echo ':)' install: - install -m 755 -d $(sharedir)/ibus/component - install -m 644 -t $(sharedir)/ibus/component/ rime.xml - install -m 755 -d $(libexecdir)/ibus-rime - install -m 755 -t $(libexecdir)/ibus-rime/ $(builddir)/ibus-engine-rime - install -m 755 -d $(sharedir)/ibus-rime - install -m 755 -d $(sharedir)/ibus-rime/icons - install -m 644 -t $(sharedir)/ibus-rime/icons/ icons/*.png - install -m 755 -d $(sharedir)/rime-data - install -m 644 -t $(sharedir)/rime-data/ ibus_rime.yaml + (cd $(builddir); make install) uninstall: - rm $(sharedir)/ibus/component/rime.xml - rm -R $(sharedir)/ibus-rime - rm -R $(libexecdir)/ibus-rime - rm $(sharedir)/rime-data/ibus_rime.yaml + (cd $(builddir); xargs rm < install_manifest.txt) clean: if [ -e $(builddir) ]; then rm -R $(builddir); fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/README.md new/ibus-rime-1.4.1~git20201204.bfabe67/README.md --- old/ibus-rime-1.4.1~git20200712.33b2755/README.md 2020-07-12 09:30:51.000000000 +0200 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/README.md 2020-12-04 06:29:18.000000000 +0100 @@ -6,7 +6,7 @@ code repository: https://github.com/rime/ibus-rime -license: GPLv3 +license: GPLv3-or-later ## installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/install-static.sh new/ibus-rime-1.4.1~git20201204.bfabe67/install-static.sh --- old/ibus-rime-1.4.1~git20200712.33b2755/install-static.sh 2020-07-12 09:30:51.000000000 +0200 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/install-static.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -#!/bin/bash - -git submodule update --init - -if [ ! -e lib ]; then ln -s librime/thirdparty/lib; fi -(cd librime; make thirdparty) || exit 1 - -(cd librime; make librime-static && sudo make -C build-static install) || exit 1 - -(cd plum; make && sudo make install) || exit 1 - -make builddir=build-static clean && \ -make builddir=build-static ibus-engine-rime-static && \ -sudo make builddir=build-static install || exit 1 - -if [ "$1" == '--restart' ]; then - ibus-daemon -drx -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/install.sh new/ibus-rime-1.4.1~git20201204.bfabe67/install.sh --- old/ibus-rime-1.4.1~git20200712.33b2755/install.sh 2020-07-12 09:30:51.000000000 +0200 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/install.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#!/bin/bash - -git submodule update --init - -(cd librime; make && sudo make install) || exit 1 -(cd plum; make && sudo make install) || exit 1 - -make clean && make && sudo make install || exit 1 - -if [ "$1" == '--restart' ]; then - ibus-daemon -drx -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/rime.xml new/ibus-rime-1.4.1~git20201204.bfabe67/rime.xml --- old/ibus-rime-1.4.1~git20200712.33b2755/rime.xml 2020-07-12 09:30:51.000000000 +0200 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/rime.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- filename: rime.xml --> -<component> - <name>im.rime.Rime</name> - <description>Rime Component</description> - <exec>/usr/lib/ibus-rime/ibus-engine-rime --ibus</exec> - <version>1.0</version> - <author>GONG Chen <[email protected]></author> - <license>GPL</license> - <homepage>https://rime.im</homepage> - <textdomain>ibus-rime</textdomain> - <engines> - <engine> - <name>rime</name> - <language>zh</language> - <license>GPL</license> - <author>GONG Chen <[email protected]></author> - <icon>/usr/share/ibus-rime/icons/rime.png</icon> - <layout>default</layout> - <longname>Rime</longname> - <description>Rime Input Method Engine</description> - <rank>0</rank> - <symbol>㞢</symbol> - </engine> - </engines> -</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/rime.xml.in new/ibus-rime-1.4.1~git20201204.bfabe67/rime.xml.in --- old/ibus-rime-1.4.1~git20200712.33b2755/rime.xml.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/rime.xml.in 2020-12-04 06:29:18.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- filename: rime.xml --> +<component> + <name>im.rime.Rime</name> + <description>Rime Component</description> + <exec>@CMAKE_INSTALL_FULL_LIBEXECDIR@/ibus-rime/ibus-engine-rime --ibus</exec> + <version>1.0</version> + <author>GONG Chen <[email protected]></author> + <license>GPL</license> + <homepage>https://rime.im</homepage> + <textdomain>ibus-rime</textdomain> + <engines> + <engine> + <name>rime</name> + <language>zh</language> + <license>GPL</license> + <author>GONG Chen <[email protected]></author> + <icon>@CMAKE_INSTALL_FULL_DATADIR@/ibus-rime/icons/rime.png</icon> + <layout>default</layout> + <longname>Rime</longname> + <description>Rime Input Method Engine</description> + <rank>0</rank> + <symbol>㞢</symbol> + </engine> + </engines> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/rime_config.h new/ibus-rime-1.4.1~git20201204.bfabe67/rime_config.h --- old/ibus-rime-1.4.1~git20200712.33b2755/rime_config.h 2020-07-12 09:30:51.000000000 +0200 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/rime_config.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -#ifndef RIME_CONFIG_H_ -#define RIME_CONFIG_H_ - -#define RIME_VERSION "1.4.0" - -#define IBUS_RIME_INSTALL_PREFIX "/usr" -#define IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX "/share/rime-data" -#define IBUS_RIME_ICONS_DIR IBUS_RIME_INSTALL_PREFIX "/share/ibus-rime/icons" - -#endif // RIME_CONFIG_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-rime-1.4.1~git20200712.33b2755/rime_config.h.in new/ibus-rime-1.4.1~git20201204.bfabe67/rime_config.h.in --- old/ibus-rime-1.4.1~git20200712.33b2755/rime_config.h.in 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-rime-1.4.1~git20201204.bfabe67/rime_config.h.in 2020-12-04 06:29:18.000000000 +0100 @@ -0,0 +1,9 @@ +#ifndef RIME_CONFIG_H_ +#define RIME_CONFIG_H_ + +#define RIME_VERSION "1.4.0" + +#define IBUS_RIME_SHARED_DATA_DIR "@RIME_DATA_DIR@" +#define IBUS_RIME_ICONS_DIR "@IBUS_RIME_ICONS_DIR@" + +#endif // RIME_CONFIG_H_
