Hello community, here is the log from the commit of package scim-sunpinyin for openSUSE:Factory checked in at 2013-07-24 17:29:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-sunpinyin (Old) and /work/SRC/openSUSE:Factory/.scim-sunpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-sunpinyin" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-sunpinyin/scim-sunpinyin.changes 2012-10-31 14:05:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim-sunpinyin.new/scim-sunpinyin.changes 2013-07-24 17:29:39.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 24 11:30:49 UTC 2013 - i@marguerite.su + +- fix openSUSE:Factory rpm 4.11 build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-sunpinyin.spec ++++++ --- /var/tmp/diff_new_pack.H6L2Ja/_old 2013-07-24 17:29:39.000000000 +0200 +++ /var/tmp/diff_new_pack.H6L2Ja/_new 2013-07-24 17:29:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-sunpinyin # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -23,33 +23,30 @@ License: LGPL-2.1 or CDDL-1.0 Group: System/I18n/Chinese Url: http://code.google.com/p/sunpinyin/ -%if 0%{?suse_version} +Source: http://sunpinyin.googlecode.com/files/%{name}-%{version}.tar.gz +#Add GTK_CHECK_VERSION to remove some deprecated functions fjkong@suse.com +Patch1: scim-sunpinyin-remove-old-functions.patch +#BuildRequires gtk3-devel fjkong@suse.com +Patch2: scim-sunpinyin-sconstruct-gtk3.patch BuildRequires: gcc-c++ +%if 0%{?sles_version} +BuildRequires: gtk2-devel +%else BuildRequires: gtk3-devel +%endif BuildRequires: intltool +BuildRequires: libsunpinyin3 BuildRequires: python >= 2.6 BuildRequires: scim-devel BuildRequires: scons +%if 0%{?suse_version} BuildRequires: sqlite3-devel %else -BuildRequires: gcc-c++ -BuildRequires: gtk3-devel -BuildRequires: intltool -BuildRequires: python >= 2.6 -BuildRequires: scim-devel -BuildRequires: scons BuildRequires: sqlite-devel %endif -BuildRequires: libsunpinyin-devel -BuildRequires: libsunpinyin3 -Source: http://sunpinyin.googlecode.com/files/%{name}-%{version}.tar.gz +BuildRequires: sunpinyin-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -#Add GTK_CHECK_VERSION to remove some deprecated functions fjkong@suse.com -Patch1: scim-sunpinyin-remove-old-functions.patch -#BuildRequires gtk3-devel fjkong@suse.com -Patch2: scim-sunpinyin-sconstruct-gtk3.patch - %description SunPinyin === @@ -66,18 +63,8 @@ scim-sunpinyin is a wrapper around SunPinyin which enables user to use SunPinyin with scim framework. -Authors: --------- - Lei Zhang <phill.zhang@sun.com> - Ervin Yan <ervin.yan@sun.com> - Yong Sun <mail@yongsun.me> - Kefu Chai <tchaikov@gmail.com> - Wei Xue <wei.xue@sun.com> - Leo Zheng <zym361@gmail.com> - chumsdock <vorbei@gmail.com> - %prep -%setup -q -n %{name}-%{version} +%setup -q %patch1 -p1 %patch2 -p1 @@ -85,20 +72,12 @@ scons --prefix=/usr --libdir=%{_libdir} %install -scons install --prefix=/usr --libdir=%{_libdir} --install-sandbox=$RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT +scons install --prefix=/usr --libdir=%{_libdir} --install-sandbox=%{buildroot} %files %defattr(-,root,root) -#%doc ChangeLog README COPYING -%dir %{_libdir}/scim-1.0 -%dir %{_libdir}/scim-1.0/1.4.0 -%dir %{_libdir}/scim-1.0/1.4.0/IMEngine/ -%dir %{_libdir}/scim-1.0/1.4.0/SetupUI/ %{_libdir}/scim-1.0/1.4.0/IMEngine/sunpinyin_imengine.so -%dir %{_libdir}/scim-1.0/1.4.0/SetupUI/sunpinyin_imengine_setup.so +%{_libdir}/scim-1.0/1.4.0/SetupUI/sunpinyin_imengine_setup.so %{_datadir}/scim/icons/sunpinyin_logo.png %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org