Hello community, here is the log from the commit of package fcitx for openSUSE:12.3 checked in at 2013-02-05 11:13:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/fcitx (Old) and /work/SRC/openSUSE:12.3/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/fcitx/fcitx.changes 2013-02-05 11:07:22.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.fcitx.new/fcitx.changes 2013-02-05 11:13:02.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Feb 4 08:45:33 UTC 2013 - [email protected] + +- remove BuildRequires: intltool, fcitx no longer use intltool + to parse translations. +- query immodules for gtk*-32bit subpackages. +- explicitly add enchant, presage, opencc requirements, fcitx use + dlopen to detect them, ld can't fulfill its needs. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.KFukFp/_old 2013-02-05 11:13:02.000000000 +0100 +++ /var/tmp/diff_new_pack.KFukFp/_new 2013-02-05 11:13:02.000000000 +0100 @@ -72,7 +72,6 @@ %endif BuildRequires: cmake BuildRequires: gtk2-devel -BuildRequires: intltool BuildRequires: opencc-devel %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: gobject-introspection-devel @@ -92,9 +91,20 @@ %if 0%{?suse_version} Recommends: %{name}-pinyin = %{version}-%{release} Recommends: %{name}-table = %{version}-%{release} +# These libraries are dlopen-ed in fcitx at runtime +# for spell-checking for keyboard users. ld can't find +# them, so explicitly recommends. +Recommends: libopencc1 +Recommends: libpresage1 +Recommends: libenchant1 Requires: %{name}-branding = %{version} %endif %if 0%{?fedora_version} +Requires: %{name}-pinyin = %{version}-%{release} +Requires: %{name}-table = %{version}-%{release} +Requires: opencc +Requires: libpresage1 +Requires: enchant Requires(post): %{_sbindir}/alternatives Requires(postun): %{_sbindir}/alternatives %endif @@ -375,7 +385,11 @@ mkdir build cd build +# fix dlopen-ed library name cmake .. \ + -DOPENCC_LIBRARY_FILENAME=libopencc.so.1 \ + -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \ + -DPRESAGE_LIBRARY_FILENAME=libpresage.so.1 \ %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} -DENABLE_GTK3_IM_MODULE=On \ %endif @@ -390,14 +404,6 @@ -DENABLE_DEBUG=On \ -DENABLE_LUA=On -# copy external data -#pushd ../data -#cp -r %{S:5} ./ -#popd -#pushd ../data/table -#cp -r %{S:6} ./ -#popd - # fix gobject-introspection build export SUSE_ASNEEDED=0 make @@ -499,9 +505,6 @@ %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} %{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so %endif -%if 0%{?suse_version} > 1110 || 0%{?fedora_version} -#%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so -%endif # Convenient define for the scriplets %if %{_lib} == lib64 ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.KFukFp/_old 2013-02-05 11:13:02.000000000 +0100 +++ /var/tmp/diff_new_pack.KFukFp/_new 2013-02-05 11:13:02.000000000 +0100 @@ -1,4 +1,32 @@ libfcitx-4_2_7 + requires "fcitx = <version>" + obsoletes "libfcitx-<targettype> = <version>" + provides "libfcitx-<targettype> = <version>" + post "/sbin/ldconfig" + postun "/sbin/ldconfig" fcitx-gtk2 + requires "libfcitx-4_2_7-<targettype> = <version>" + post "%if "%_lib" == "lib64"" + post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" + post "%else" + post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" + post "%endif" + postun "%if "%_lib" == "lib64"" + postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" + postun "%else" + postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" + postun "%endif" fcitx-gtk3 -fcitx-qt4 \ No newline at end of file + requires "libfcitx-4_2_7-<targettype> = <version>" + post "%if "%_lib" == "lib64"" + post "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" + post "%else" + post "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" + post "%endif" + postun "%if "%_lib" == "lib64"" + postun "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache" + postun "%else" + postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" + postun "%endif" +fcitx-qt4 + requires "libfcitx-4_2_7-<targettype> = <version>" \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
