Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-06-07 15:37:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-05-21 07:24:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-06-07 15:38:03.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Jun 3 13:05:53 UTC 2012 - [email protected] + +- update to 4.2.4 + * fix some xim problem + * add fcitx-gclient for glib and gir binding, can be used to control fcitx or implement fcitx client. + * merge fcitx-keyboard into fcitx + * bind specific keyboard layout with inputmethod + (you need up to date fcitx-configtool，gtk3 ver or kcm-fcitx to configure this feature) + * adjust some default hotkey setting. +- drop openSUSE 11.4 lua51 patch. upstream fixed. +- drop downgrade gio version patch. upstream fixed. +- add SUSE_ASNEEDED=0 macro to avoid a gobject-introspection bug as vuntz suggested. thanks! + +------------------------------------------------------------------- +Sun Jun 3 04:46:37 UTC 2012 - [email protected] + +- fix sles builds. + * add version tags. + * changed source compression. + * add a patch to downgrade gio's version. + * use xim instead of qt im module. + +------------------------------------------------------------------- Old: ---- fcitx-4.2.3-openSUSE-11.4-lua51.patch fcitx-4.2.3.tar.xz New: ---- fcitx-4.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ --- /var/tmp/diff_new_pack.kqllbT/_old 2012-06-07 15:38:06.000000000 +0200 +++ /var/tmp/diff_new_pack.kqllbT/_new 2012-06-07 15:38:06.000000000 +0200 @@ -15,16 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define libver -4_2_3 + +%define libver -4_2_4 Name: fcitx -Version: 4.2.3 -Release: 1 +Version: 4.2.4 +Release: 0 Summary: A Flexible Input Method Framework for CJK -Url: http://code.google.com/p/fcitx -Group: System/I18n/Chinese License: GPL-2.0+ -Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz +Group: System/I18n/Chinese +Url: http://code.google.com/p/fcitx +#Source: http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz +# use bzip to be compatible with sles. +Source: %{name}-%{version}.tar.bz2 Source1: xim.d-fcitx Source2: fcitx-README.suse Source3: xim.fcitx.suse.template @@ -32,32 +35,43 @@ Source6: table.tar.gz #FIX-FOR-UPSTREAM [email protected] - dont download online Patch1: fix_fcitx_googlecode_resolv_error.patch -#FIX-FOR-UPSTREAM [email protected] - fix lua51 builds on 11.4 -Patch2: fcitx-4.2.3-openSUSE-11.4-lua51.patch -BuildRequires: xz BuildRequires: cairo-devel -BuildRequires: pango-devel BuildRequires: dbus-1-devel BuildRequires: dbus-1-glib-devel +BuildRequires: enchant-devel +BuildRequires: iso-codes-devel +BuildRequires: pango-devel BuildRequires: update-desktop-files +%if 0%{?suse_version} >= 1110 BuildRequires: fdupes +%endif +%if 0%{?suse_version} > 1110 BuildRequires: libqt4-devel +%endif %if 0%{?suse_version} <= 1210 BuildRequires: lua-devel %else BuildRequires: lua51-devel %endif -BuildRequires: opencc-devel -BuildRequires: intltool BuildRequires: cmake BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: opencc-devel +%if 0%{?suse_version} >= 1140 BuildRequires: gtk3-devel +BuildRequires: gobject-introspection-devel +%endif BuildRequires: gcc-c++ BuildRequires: libicu-devel -Requires: lib%{name}%{libver} = %{version}-%{release} +BuildRequires: libxml2-devel Requires: %{name}-gtk2 = %{version}-%{release} +Requires: lib%{name}%{libver} = %{version}-%{release} +%if 0%{?suse_version} >= 1140 Requires: %{name}-gtk3 = %{version}-%{release} +%endif +%if 0%{?suse_version} > 1110 Requires: %{name}-qt4 = %{version}-%{release} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: locale(ko;zh_CN;zh_SG) @@ -92,6 +106,8 @@ %description gtk2 This package contains fcitx im module for gtk2 +%if 0%{?suse_version} >= 1140 + %package gtk3 Summary: Gtk3 IM Module for %{name} Group: System/I18n/Chinese @@ -101,6 +117,9 @@ %description gtk3 This package contains fcitx im module for gtk3 +%endif +%if 0%{?suse_version} > 1110 + %package qt4 Summary: Qt4 IM Module for %{name} Group: System/I18n/Chinese @@ -109,18 +128,23 @@ %description qt4 This package contains fcitx im module for qt4 +%endif + %prep %setup -q -n %{name}-%{version} %patch1 -p1 -%patch2 -p1 %build mkdir build cd build cmake .. -DENABLE_GTK2_IM_MODULE=On \ +%if 0%{?suse_version} >= 1140 -DENABLE_GTK3_IM_MODULE=On \ +%endif +%if 0%{?suse_version} > 1110 -DENABLE_QT_IM_MODULE=On \ +%endif -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB_INSTALL_DIR=%{_libdir} \ -DENABLE_DEBUG=On \ @@ -135,11 +159,13 @@ cp -r %{S:6} ./ popd +#fix gobject-introspection build +export SUSE_ASNEEDED=0 make %install cd build -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall cd .. @@ -173,14 +199,20 @@ %find_lang %{name} +%if 0%{?suse_version} >= 1110 %fdupes %{buildroot} +%endif #strip libraries %{__strip} %{buildroot}%{_libdir}/%{name}/*.so %{__strip} %{buildroot}%{_libdir}/libfcitx*.so.* %{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so +%if 0%{?suse_version} >= 1140 %{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so +%endif +%if 0%{?suse_version} > 1110 %{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so +%endif #Convenient define for the scriplets %if %{_lib} == lib64 @@ -191,6 +223,14 @@ %define _gtk2_query_immodules_update_cache %{_gtk2_query_immodules} > %{_sysconfdir}/gtk-2.0/gtk.immodules %endif +%post gtk2 +%{_gtk2_query_immodules_update_cache} + +%postun gtk2 +%{_gtk2_query_immodules_update_cache} + +%if 0%{?suse_version} >= 1140 + %if %{_lib} == lib64 %define _gtk3_query_immodules %{_bindir}/gtk-query-immodules-3.0-64 %else @@ -198,9 +238,6 @@ %endif %define _gtk3_query_immodules_update_cache %{_gtk3_query_immodules} --update-cache -%post gtk2 -%{_gtk2_query_immodules_update_cache} - %post gtk3 %{_gtk3_query_immodules_update_cache} @@ -211,12 +248,11 @@ sed "/^const STANDARD_TRAY_ICON_IMPLEMENTATIONS/a \ 'fcitx': 'input-method'," $TARGET-fcitx > $TARGET fi -%postun gtk2 -%{_gtk2_query_immodules_update_cache} - %postun gtk3 %{_gtk3_query_immodules_update_cache} +%endif + %post -p /sbin/ldconfig %post -n lib%{name}%{libver} -p /sbin/ldconfig @@ -246,9 +282,15 @@ %defattr(-,root,root) %{_libdir}/gtk-2.0/* +%if 0%{?suse_version} >= 1140 + %files gtk3 %defattr(-,root,root) %{_libdir}/gtk-3.0/* +%{_libdir}/girepository-1.0/Fcitx-1.0.typelib +%{_datadir}/gir-1.0/Fcitx-1.0.gir + +%endif %files devel %defattr(-,root,root) @@ -256,8 +298,12 @@ %{_datadir}/cmake/ %{_includedir}/* +%if 0%{?suse_version} > 1110 + %files qt4 %defattr(-,root,root) %{_libdir}/qt4/* +%endif + %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kqllbT/_old 2012-06-07 15:38:06.000000000 +0200 +++ /var/tmp/diff_new_pack.kqllbT/_new 2012-06-07 15:38:06.000000000 +0200 @@ -1,13 +1,13 @@ <services> - <service name="tar_scm" mode="localonly"> + <service name="tar_scm" mode="disabled"> <param name="history-depth">all</param><param name="url">http://code.google.com/p/fcitx/</param><param name="versionprefix">4.2git</param><param name="filename">fcitx</param><param name="scm">git</param></service> - <service name="recompress" mode="localonly"> + <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">bz2</param> </service> - <service name="set_version" mode="localonly"/> + <service name="set_version" mode="disabled"/> </services> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.kqllbT/_old 2012-06-07 15:38:06.000000000 +0200 +++ /var/tmp/diff_new_pack.kqllbT/_new 2012-06-07 15:38:06.000000000 +0200 @@ -1,4 +1,4 @@ -libfcitx-4_2_3 +libfcitx-4_2_4 fcitx-gtk2 fcitx-gtk3 fcitx-qt4 \ No newline at end of file ++++++ fcitx-4.2.3.tar.xz -> fcitx-4.2.4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/fcitx/fcitx-4.2.3.tar.xz /work/SRC/openSUSE:Factory/.fcitx.new/fcitx-4.2.4.tar.bz2 differ: char 1, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
