Hello community, here is the log from the commit of package librime for openSUSE:Factory checked in at 2020-10-27 18:59:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librime (Old) and /work/SRC/openSUSE:Factory/.librime.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librime" Tue Oct 27 18:59:20 2020 rev:24 rq:844098 version:1.6.2~git20200921.4e518b9 Changes: -------- --- /work/SRC/openSUSE:Factory/librime/librime.changes 2020-10-23 12:24:45.556892894 +0200 +++ /work/SRC/openSUSE:Factory/.librime.new.3463/librime.changes 2020-10-27 18:59:44.710778174 +0100 @@ -1,0 +2,9 @@ +Sun Oct 25 14:05:02 UTC 2020 - Marguerite Su <[email protected]> + +- revert: Add plugin librime-lua + * different upstream, bundling not possible + * no LICENSE + * can be and should be built separately +- expose internal headers for librime plugins + +------------------------------------------------------------------- Old: ---- librime-lua.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librime.spec ++++++ --- /var/tmp/diff_new_pack.1XHod1/_old 2020-10-27 18:59:45.710778902 +0100 +++ /var/tmp/diff_new_pack.1XHod1/_new 2020-10-27 18:59:45.714778905 +0100 @@ -24,7 +24,6 @@ Group: System/I18n/Chinese URL: https://github.com/rime/librime Source: %{name}-%{version}.tar.xz -Source1: librime-lua.tar.xz Source99: baselibs.conf #PATCH-FIX-OPENSUSE workaround for gcc bug 53613 on 12.3 and lower Patch1: librime-1.1-gcc53613.patch @@ -50,8 +49,6 @@ %else BuildRequires: boost-devel %endif -# for plugins -BuildRequires: pkgconfig(lua) >= 5.1 %description Rime is an Traditional Chinese input method engine. @@ -94,27 +91,12 @@ This package is the development headers of Rime. -%package -n librime-lua -Summary: Extending RIME with Lua scripts -Group: System/Libraries -Requires: rime = %{version} - -%description -n librime-lua -Extending RIME with lua scripts. -Features: - Supports extending RIME processors, segmentors, translators and filters - Provides high-level programming model for translators and filters - Loaded dynamically as a librime plugin - -This package is a plugin of librime. - %prep %setup -q %if 0%{?suse_version} <= 1230 %patch1 -p1 %patch2 -p1 %endif -tar xf %{S:1} -C plugins %build # build internal capnproto @@ -125,12 +107,23 @@ make install popd -%cmake -DCapnProto_DIR=thirdparty/src/%{_lib}/cmake/CapnProto \ - -DBUILD_MERGED_PLUGINS=OFF +%cmake -DCapnProto_DIR=thirdparty/src/%{_lib}/cmake/CapnProto make %{?_smp_mflags} %install %cmake_install +# librime-lua +mkdir -p %{buildroot}%{_includedir}/rime +for i in $(find src/rime/ -type f -name "*.h"); do + dir=$(dirname $i); + if [ "$dir" != "src/rime" ]; then + target_dir=$(basename $dir); + mkdir -p %{buildroot}%{_includedir}/rime/$target_dir; + cp -r $i %{buildroot}%{_includedir}/rime/$target_dir/; + else + cp -r $i %{buildroot}%{_includedir}/rime/; + fi +done %post -n librime1 -p /sbin/ldconfig %postun -n librime1 -p /sbin/ldconfig @@ -149,11 +142,9 @@ %files devel %{_includedir}/rime_api.h %{_includedir}/rime_levers_api.h +%{_includedir}/rime %{_libdir}/%{name}.so %{_libdir}/pkgconfig/rime.pc %{_datadir}/cmake/rime/ -%files -n librime-lua -%{_libdir}/librime-lua.so - %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.1XHod1/_old 2020-10-27 18:59:45.754778933 +0100 +++ /var/tmp/diff_new_pack.1XHod1/_new 2020-10-27 18:59:45.754778933 +0100 @@ -8,13 +8,6 @@ <param name="submodule">master</param> <param name="changesgenerate">enable</param> </service> - <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/hchunhui/librime-lua.git</param> - <param name="scm">git</param> - <param name="exclude">.git</param> - <param name="version">_none_</param> - <param name="revision">master</param> - </service> <service name="recompress" mode="disabled"> <param name="file">librime-*.tar</param> <param name="compression">xz</param>
