Hello community, here is the log from the commit of package scim for openSUSE:Factory checked in at 2012-06-07 15:40:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-21 07:32:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim.new/scim.changes 2012-06-07 15:40:37.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Jun 6 06:17:01 UTC 2012 - i...@marguerite.su + +- versioned obsoletes. +- fdupes. + * but it's useless on this package. + +------------------------------------------------------------------- +Sat Jun 2 11:38:03 UTC 2012 - i...@marguerite.su + +- fix build sle11. + +------------------------------------------------------------------- +Sat Jun 2 01:08:08 UTC 2012 - i...@marguerite.su + +- update to 1.4.13:the installation procedure adapted. +- add ld-version-script.patch:fix im-scim-version-script build. +- add CXXFLAGS to detect gettex in gcc4.7 +- fix rpmlint warnings as I can. +- run format_spec_file and spec-cleaner. +- drop obsolete patches. + +------------------------------------------------------------------- Old: ---- gtk3-1.4.11.diff scim-1.4.11.tar.gz scim-gtk2-register-fix.diff New: ---- scim-1.4.13-ld-version-script.patch scim-1.4.13.tar.gz sle-11-gtk-widget-get-visible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim.spec ++++++ --- /var/tmp/diff_new_pack.v49Vs5/_old 2012-06-07 15:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.v49Vs5/_new 2012-06-07 15:40:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,44 +15,64 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: scim -BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz BuildRequires: graphviz-gd -BuildRequires: gtk2-devel BuildRequires: intltool +# for older distros +BuildRequires: gtk2-devel +BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel +BuildRequires: libtool BuildRequires: libxslt BuildRequires: perl-XML-Parser BuildRequires: update-desktop-files -# for older distros -BuildRequires: libexpat-devel -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 BuildRequires: gtk3-devel %endif -Summary: Smart Chinese/Common Input Method platform -Version: 1.4.11 +Version: 1.4.13 Release: 0 +Summary: Smart Chinese/Common Input Method platform License: LGPL-2.1+ Group: System/I18n/Chinese -PreReq: /usr/bin/touch -Obsoletes: scim-frontend-x11, scim-server-rawcode, scim-config-simple, scim-server-table, scim-gtk2-immodule, scim-config-socket, scim-server-socket, scim-config-gconf, scim-frontend-socket -Provides: scim-frontend-x11, scim-server-rawcode, scim-config-simple, scim-server-table, scim-gtk2-immodule, scim-config-socket, scim-server-socket, scim-frontend-socket Url: http://www.scim-im.org/ Source0: scim-%{version}.tar.gz Source1: baselibs.conf Source10: etc-x11-xim.d-scim Source11: SuSEconfig.scim Patch1: configs.patch -Patch3: scim-no-setpwent.diff -Patch4: scim-gtk2-register-fix.diff -Patch5: gtk3-1.4.11.diff +Patch2: scim-no-setpwent.diff +#FIX-FOR-UPSTREAM fix build im-scim.version-script +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 +Obsoletes: scim-config-gconf < %{version}-%{release} +Obsoletes: scim-config-simple < %{version}-%{release} +Obsoletes: scim-config-socket < %{version}-%{release} +Obsoletes: scim-frontend-socket < %{version}-%{release} +Obsoletes: scim-frontend-x11 < %{version}-%{release} +Obsoletes: scim-gtk2-immodule < %{version}-%{release} +Obsoletes: scim-server-rawcode < %{version}-%{release} +Obsoletes: scim-server-socket < %{version}-%{release} +Obsoletes: scim-server-table < %{version}-%{release} +Provides: scim-config-gconf +Provides: scim-config-simple +Provides: scim-config-socket +Provides: scim-frontend-socket +Provides: scim-frontend-x11 +Provides: scim-gtk2-immodule +Provides: scim-server-rawcode +Provides: scim-server-socket +Provides: scim-server-table BuildRoot: %{_tmppath}/%{name}-%{version}-build %gtk2_immodule_requires -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 %gtk3_immodule_requires %endif %define gnome_prefix %(pkg-config --variable=prefix libgnomeui-2.0) @@ -61,29 +81,19 @@ SCIM is a developing platform to significantly reduce the difficulty of input method development. - - -Authors: --------- - James Su <su...@tsinghua.org.cn> - %package devel -Summary: Include Files and Libraries mandatory for Development. -Requires: %{name} = %{version}, libstdc++-devel -Requires: pkgconfig >= 0.12 +Summary: Include Files and Libraries mandatory for Development +Group: System/I18n/Chinese +Requires: %{name} = %{version} Requires: gtk2-devel Requires: libexpat-devel +Requires: libstdc++-devel +Requires: pkgconfig >= 0.12 %description devel This package contains all necessary include files and libraries needed to develop applications that require these. - - -Authors: --------- - James Su <su...@tsinghua.org.cn> - %prep %define build_config_socket 1 %define build_config_simple 1 @@ -96,38 +106,39 @@ %define build_scim_setup 1 %define build_panel_gtk 1 %define build_gtk_utils 1 -%setup -q -n %{name}-%{version} +%setup -q %patch1 -p1 -%if %suse_version > 1110 -%patch3 -p1 +%if 0%{?suse_version} > 1110 +%patch2 -p1 %endif +%patch3 -p1 %patch4 -p1 -%if %suse_version > 1130 -%patch5 -p1 -%endif 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/,$//") perl -pi -e "s/\/SupportedUnicodeLocales =.*/\/SupportedUnicodeLocales = $UTF_8_LOCALES/" ./configs/global # hack to build with older distros -%if %suse_version < 1100 +%if 0%{?suse_version} < 1100 sed -i -e'/supplements/d' $RPM_SOURCE_DIR/baselibs.conf %endif %build -%if %suse_version <= 1100 +%if 0%{?suse_version} <= 1100 libtoolize --force autoreconf --force --install --verbose %endif + if [ ! -f po/Makevars -a -f po/Makevars.template ] ; then cp po/Makevars.template po/Makevars fi if [ ! -f po/Makevars -a -f /usr/share/gettext/po/Makevars.template ] ; then cp /usr/share/gettext/po/Makevars.template po/Makevars fi -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" +# so configure detects gettext with gcc-4.7 +export CXXFLAGS="-fpermissive" %configure\ --libexecdir=%{_prefix}/lib/scim-1.0\ -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 --with-gtk3-im-module-dir=%{_libdir}/gtk-3.0/3.0.0/immodules\ %endif --disable-static\ @@ -167,26 +178,26 @@ ## make -C docs/manual/zh_CN html %install -make DESTDIR=${RPM_BUILD_ROOT} top_builddir=$(pwd) install -mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI} -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/lib*.*a -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.*a -rm -f ${RPM_BUILD_ROOT}/%{gnome_prefix}/%_lib/gtk-2.0/immodules/im-scim.*a -%if %suse_version > 1130 -rm -f ${RPM_BUILD_ROOT}/%{_libdir}/gtk-3.0/3.0.0/immodules/*.la +make DESTDIR=%{buildroot} top_builddir=$(pwd) install +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 +%if 0%{?suse_version} > 1130 +rm -f %{buildroot}/%{_libdir}/gtk-3.0/3.0.0/immodules/*.la %endif # install user manual # mkdir -p docs/dist/manual/zh_CN/figures/ # cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/ # cp -a docs/manual/zh_CN/figures/*.png docs/dist/manual/zh_CN/figures/ # install configuration files -mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ +mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-scim \ - $RPM_BUILD_ROOT/etc/X11/xim.d/scim + %{buildroot}%{_sysconfdir}/X11/xim.d/scim # install symlinks in /etc/X11/xim.d/$lang for all languages # where SCIM might be useful: PRIORITY=50 -pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ +pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \ pa ru sk vi zh_TW zh_CN zh_HK zh_SG \ de fr it es nl cs pl da nn nb fi en sv @@ -197,21 +208,20 @@ popd done popd -mkdir -p $RPM_BUILD_ROOT/sbin/conf.d/ +mkdir -p %{buildroot}/sbin/conf.d/ install -m 755 $RPM_SOURCE_DIR/SuSEconfig.scim \ - $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.scim + %{buildroot}/sbin/conf.d/SuSEconfig.scim %find_lang scim %suse_update_desktop_file scim-setup System SystemSetup -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +%fdupes %{buildroot} %post /sbin/ldconfig %if %{build_gtk2_immodule} %gtk2_immodule_post %endif -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 #Add icons to gnome3 panel TARGET="/usr/share/gnome-shell/js/ui/statusIconDispatcher.js" if [ -f $TARGET ] && [ ! -f $TARGET-scim ] ; then @@ -226,17 +236,17 @@ %if %{build_gtk2_immodule} %gtk2_immodule_postun %endif -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 %gtk3_immodule_postun %endif %files -f scim.lang %defattr(-, root, root) -%doc AUTHORS COPYING NEWS README ChangeLog TODO +%doc AUTHORS COPYING README ChangeLog TODO # %doc docs/dist/manual/zh_CN /sbin/conf.d/SuSEconfig.scim -%dir /etc/X11/xim.d/ -/etc/X11/xim.d/* +%dir %{_sysconfdir}/X11/xim.d/ +%config %{_sysconfdir}/X11/xim.d/* %dir %{_sysconfdir}/scim %config %{_sysconfdir}/scim/* %{_libdir}/lib*.so.* @@ -249,10 +259,10 @@ %{_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 +%dir %{gnome_prefix}/%{_lib}/gtk-2.0/immodules +%{gnome_prefix}/%{_lib}/gtk-2.0/immodules/im-scim.so %endif -%if %suse_version > 1130 +%if 0%{?suse_version} > 1130 %{_libdir}/gtk-3.0/3.0.0/immodules/im-scim.so %endif ++++++ SuSEconfig.scim ++++++ --- /var/tmp/diff_new_pack.v49Vs5/_old 2012-06-07 15:40:39.000000000 +0200 +++ /var/tmp/diff_new_pack.v49Vs5/_new 2012-06-07 15:40:39.000000000 +0200 @@ -1,3 +1,4 @@ +#! /bin/sh # SuSEconfig.scim: this script will set the default KeyboardLayout setting of scim according to the system keyboard setting. # # check if we are started as root ++++++ scim-1.4.13-ld-version-script.patch ++++++ diff -urN scim-1.4.13.orig/extras/gtk_immodule/gtk2/Makefile.am scim-1.4.13/extras/gtk_immodule/gtk2/Makefile.am --- scim-1.4.13.orig/extras/gtk_immodule/gtk2/Makefile.am 2012-06-02 10:12:50.044731278 +0800 +++ scim-1.4.13/extras/gtk_immodule/gtk2/Makefile.am 2012-06-02 10:14:42.896320437 +0800 @@ -27,7 +27,7 @@ endif if SCIM_LD_VERSION_SCRIPT -LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/im-scim.version-script" +LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/../im-scim.version-script" endif noinst_HEADERS = ../gtkimcontextscim.h diff -urN scim-1.4.13.orig/extras/gtk_immodule/gtk2/Makefile.in scim-1.4.13/extras/gtk_immodule/gtk2/Makefile.in --- scim-1.4.13.orig/extras/gtk_immodule/gtk2/Makefile.in 2012-06-02 10:12:50.044731278 +0800 +++ scim-1.4.13/extras/gtk_immodule/gtk2/Makefile.in 2012-06-02 10:41:56.515897383 +0800 @@ -345,7 +345,7 @@ @SCIM_BUILD_GTK2_IMMODULE_TRUE@CONFIG_GTK2_IMMODULE = im-scim.la @SCIM_BUILD_X11_UTILS_TRUE@X11_UTILS = $(top_builddir)/utils/libscim-x11utils@SCIM_EPOCH@.la -@SCIM_LD_VERSION_SCRIPT_TRUE@LD_VERSION_SCRIPT_OPTION = "-Wl,--version-script=$(srcdir)/im-scim.version-script" +@SCIM_LD_VERSION_SCRIPT_TRUE@LD_VERSION_SCRIPT_OPTION = "-Wl,--version-script=$(srcdir)/../im-scim.version-script" noinst_HEADERS = ../gtkimcontextscim.h moduledir = @GTK2_IM_MODULEDIR@ module_LTLIBRARIES = $(CONFIG_GTK2_IMMODULE) diff -urN scim-1.4.13.orig/extras/gtk_immodule/gtk3/Makefile.am scim-1.4.13/extras/gtk_immodule/gtk3/Makefile.am --- scim-1.4.13.orig/extras/gtk_immodule/gtk3/Makefile.am 2012-06-02 10:12:50.044731278 +0800 +++ scim-1.4.13/extras/gtk_immodule/gtk3/Makefile.am 2012-06-02 10:15:03.571061966 +0800 @@ -27,7 +27,7 @@ endif if SCIM_LD_VERSION_SCRIPT -LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/im-scim.version-script" +LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/../im-scim.version-script" endif noinst_HEADERS = ../gtkimcontextscim.h diff -urN scim-1.4.13.orig/extras/gtk_immodule/gtk3/Makefile.in scim-1.4.13/extras/gtk_immodule/gtk3/Makefile.in --- scim-1.4.13.orig/extras/gtk_immodule/gtk3/Makefile.in 2012-06-02 10:12:50.044731278 +0800 +++ scim-1.4.13/extras/gtk_immodule/gtk3/Makefile.in 2012-06-02 10:42:15.656658091 +0800 @@ -345,7 +345,7 @@ @SCIM_BUILD_GTK3_IMMODULE_TRUE@CONFIG_GTK3_IMMODULE = im-scim.la @SCIM_BUILD_X11_UTILS_TRUE@X11_UTILS = $(top_builddir)/utils/libscim-x11utils@SCIM_EPOCH@.la -@SCIM_LD_VERSION_SCRIPT_TRUE@LD_VERSION_SCRIPT_OPTION = "-Wl,--version-script=$(srcdir)/im-scim.version-script" +@SCIM_LD_VERSION_SCRIPT_TRUE@LD_VERSION_SCRIPT_OPTION = "-Wl,--version-script=$(srcdir)/../im-scim.version-script" noinst_HEADERS = ../gtkimcontextscim.h moduledir = @GTK3_IM_MODULEDIR@ module_LTLIBRARIES = $(CONFIG_GTK3_IMMODULE) ++++++ scim-1.4.11.tar.gz -> scim-1.4.13.tar.gz ++++++ ++++ 208260 lines of diff (skipped) ++++++ sle-11-gtk-widget-get-visible.patch ++++++ diff -urN scim-1.4.13.orig/extras/panel/scim_panel_gtk.cpp scim-1.4.13/extras/panel/scim_panel_gtk.cpp --- scim-1.4.13.orig/extras/panel/scim_panel_gtk.cpp 2012-06-02 19:45:42.058517542 +0800 +++ scim-1.4.13/extras/panel/scim_panel_gtk.cpp 2012-06-02 20:34:00.178286059 +0800 @@ -3215,7 +3215,7 @@ #if GTK_CHECK_VERSION(2, 18, 0) if (_panel_is_on && !gtk_widget_get_visible (_input_window)) #else - if (_panel_is_on && !gtk_widget_get_visible (_input_window)) + if (_panel_is_on && !GTK_WIDGET_VISIBLE (_input_window)) #endif gtk_widget_show (_input_window); diff -urN scim-1.4.13.orig/utils/scimstringview.c scim-1.4.13/utils/scimstringview.c --- scim-1.4.13.orig/utils/scimstringview.c 2012-06-02 19:45:42.049517654 +0800 +++ scim-1.4.13/utils/scimstringview.c 2012-06-02 20:47:59.713790421 +0800 @@ -561,7 +561,7 @@ #else widget->style = gtk_style_attach (widget->style, gtk_widget_get_window (widget)); -#if GTK_CHECK_VERSION(2, 14, 0) +#if GTK_CHECK_VERSION(2, 18, 0) gdk_window_set_background (gtk_widget_get_window (widget), &widget->style->base[gtk_widget_get_state (widget)]); gdk_window_set_background (string_view->text_area, &widget->style->base[gtk_widget_get_state (widget)]); #else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
