Hello community,
here is the log from the commit of package scim for openSUSE:Factory checked in
at 2012-09-13 00:06:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scim (Old)
and /work/SRC/openSUSE:Factory/.scim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim", Maintainer is "fjk...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/scim/scim.changes 2012-06-15
16:31:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.scim.new/scim.changes 2012-09-13
00:06:18.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Sep 11 22:39:16 CST 2012 - hillw...@linuxfans.org
+
+- update to 1.4.14，upstream have added gtk3 support
+- enable gtk3 ,qt3 and qt4 option
+
+-------------------------------------------------------------------
Old:
----
scim-1.4.13-ld-version-script.patch
scim-1.4.13.tar.gz
New:
----
scim-1.4.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim.spec ++++++
--- /var/tmp/diff_new_pack.XNTylu/_old 2012-09-13 00:06:21.000000000 +0200
+++ /var/tmp/diff_new_pack.XNTylu/_new 2012-09-13 00:06:21.000000000 +0200
@@ -31,11 +31,13 @@
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: perl-XML-Parser
+BuildRequires: libqt4-devel
+BuildRequires: qt3-devel
BuildRequires: update-desktop-files
%if 0%{?suse_version} > 1130
BuildRequires: gtk3-devel
%endif
-Version: 1.4.13
+Version: 1.4.14
Release: 0
Summary: Smart Chinese/Common Input Method platform
License: LGPL-2.1+
@@ -48,7 +50,7 @@
Patch1: configs.patch
Patch2: scim-no-setpwent.diff
#FIX-FOR-UPSTREAM fix build im-scim.version-script
-Patch3: scim-1.4.13-ld-version-script.patch
+# Patch3: scim-1.4.13-ld-version-script.patch
#FIX-FOR-UPSTREAM fix an upstream typo error in panel/*.cpp
Patch4: sle-11-gtk-widget-get-visible.patch
Requires(pre): /usr/bin/touch
@@ -94,6 +96,53 @@
This package contains all necessary include files and libraries needed
to develop applications that require these.
+%package gtk
+Summary: SCIM im module for gtk2
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}
+%gtk2_immodule_requires
+Supplements: packageand(scim:gtk2)
+
+%description gtk
+This package contains SCIM im module for gtk2
+
+%if 0%{?suse_version} > 1130
+%package gtk3
+
+Summary: SCIM im module for gtk3
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}
+BuildRequires: gtk3-devel
+%gtk3_immodule_requires
+Supplements: packageand(scim:gtk3)
+
+%description gtk3
+This package contains SCIM im module for gtk3
+%endif
+
+%package qt3
+Summary: SCIM im module for qt3
+Group: System/I18n/Chinese
+BuildRequires: qt3-devel
+Requires: %{name} = %{version}
+%gtk2_immodule_requires
+Supplements: packageand(scim:qt3)
+
+%description qt3
+This package contains SCIM im module for qt3
+
+
+%package qt4
+
+Summary: SCIM im module for qt4
+Group: System/I18n/Chinese
+Requires: %{name} = %{version}
+BuildRequires: libqt4-devel
+Supplements: packageand(scim:libqt4)
+
+%description qt4
+This package contains SCIM im module for qt4
+
%prep
%define build_config_socket 1
%define build_config_simple 1
@@ -111,7 +160,7 @@
%if 0%{?suse_version} > 1110
%patch2 -p1
%endif
-%patch3 -p1
+# %patch3 -p1
%patch4 -p1
find . -type f | xargs chmod u+w
UTF_8_LOCALES=$(locale -a | grep utf8 | perl -p -e "s/utf8/UTF-8/; s/\n/,/; "
| perl -p -e "s/,$//")
@@ -140,6 +189,7 @@
--libexecdir=%{_prefix}/lib/scim-1.0\
%if 0%{?suse_version} > 1130
--with-gtk3-im-module-dir=%{_libdir}/gtk-3.0/3.0.0/immodules\
+ --with-gtk-version=3\
%endif
--disable-static\
%if ! %{build_config_socket}
@@ -171,7 +221,10 @@
%endif
--enable-debug\
--enable-ld-version-script\
- --with-gtk-version=2
+ --enable-gtk2-immodule\
+ --enable-qt3-immodule\
+ --enable-qt4-immodule\
+ --with-qt3-im-module-dir=%{_libdir}/qt3/plugins/inputmethods/
make top_builddir=$(pwd)
# build documentation:
make -C docs html
@@ -183,7 +236,9 @@
mkdir -p %{buildroot}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI}
rm -f %{buildroot}/%{_libdir}/lib*.*a
rm -f %{buildroot}/%{_libdir}/scim-1.0/*/*/*.*a
-rm -f %{buildroot}/%{gnome_prefix}/%{_lib}/gtk-2.0/immodules/im-scim.*a
+rm -f %{buildroot}/%{_libdir}/gtk-2.0/2.10.0/immodules/im-scim.la
+rm -f %{buildroot}/%{_libdir}/qt3/plugins/inputmethods/im-scim.la
+rm -f %{buildroot}/%{_libdir}/qt4/plugins/inputmethods/im-scim.la
%if 0%{?suse_version} > 1130
rm -f %{buildroot}/%{_libdir}/gtk-3.0/3.0.0/immodules/*.la
%endif
@@ -259,14 +314,28 @@
%{_datadir}/applications/scim-setup.desktop
%{_datadir}/control-center-2.0
%endif
-%if %{build_gtk2_immodule}
-%dir %{gnome_prefix}/%{_lib}/gtk-2.0/immodules
-%{gnome_prefix}/%{_lib}/gtk-2.0/immodules/im-scim.so
-%endif
+
+
+%files gtk
+%defattr(-, root, root)
+%dir %{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0
+%dir %{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0/immodules
+%{gnome_prefix}/%{_lib}/gtk-2.0/2.10.0/immodules/im-scim.so
+
%if 0%{?suse_version} > 1130
+%files gtk3
+%defattr(-, root, root)
%{_libdir}/gtk-3.0/3.0.0/immodules/im-scim.so
%endif
+%files qt3
+%defattr(-, root, root)
+%{_libdir}/qt3/plugins/inputmethods/im-scim.so
+
+%files qt4
+%defattr(-, root, root)
+%{_libdir}/qt4/plugins/
+
%files devel
%defattr(-, root, root)
%doc docs/html
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.XNTylu/_old 2012-09-13 00:06:21.000000000 +0200
+++ /var/tmp/diff_new_pack.XNTylu/_new 2012-09-13 00:06:21.000000000 +0200
@@ -1,5 +1,4 @@
-scim
- prereq "/usr/bin/touch"
+scim-gtk
post "%if "%_lib" == "lib64""
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
post "%else"
@@ -11,3 +10,17 @@
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 >
<prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
postun "%endif"
supplements "packageand(scim:gtk2-<targettype>)"
+scim-gtk3
+ 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"
+ supplements "packageand(scim:gtk3-<targettype>)"
+scim-qt3
+scim-qt4
\ No newline at end of file
++++++ scim-1.4.13.tar.gz -> scim-1.4.14.tar.gz ++++++
++++ 38449 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
