commit scim-sunpinyin for openSUSE:Factory
Hello community,
here is the log from the commit of package scim-sunpinyin for openSUSE:Factory
checked in at 2017-11-24 10:57:37
Comparing /work/SRC/openSUSE:Factory/scim-sunpinyin (Old)
and /work/SRC/openSUSE:Factory/.scim-sunpinyin.new (New)
Package is "scim-sunpinyin"
Fri Nov 24 10:57:37 2017 rev:7 rq:545057 version:2.0.3
Changes:
--- /work/SRC/openSUSE:Factory/scim-sunpinyin/scim-sunpinyin.changes
2013-07-24 17:29:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.scim-sunpinyin.new/scim-sunpinyin.changes
2017-11-24 10:57:40.329269175 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 17:20:47 UTC 2017 - dims...@opensuse.org
+
+- Add scim-sunpinyin-scons-on-py3.patch: Fix build with scons using
+ python3 as interpreter.
+
+---
New:
scim-sunpinyin-scons-on-py3.patch
Other differences:
--
++ scim-sunpinyin.spec ++
--- /var/tmp/diff_new_pack.FAkPUC/_old 2017-11-24 10:57:41.285234264 +0100
+++ /var/tmp/diff_new_pack.FAkPUC/_new 2017-11-24 10:57:41.289234117 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scim-sunpinyin
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,8 @@
Patch1: scim-sunpinyin-remove-old-functions.patch
#BuildRequires gtk3-devel fjk...@suse.com
Patch2: scim-sunpinyin-sconstruct-gtk3.patch
+# PATCH-FIX-UPSTREAM scim-sunpinyin-scons-on-py3.patch dims...@opensuse.org --
Fix build with scons using python3 as interpreter
+Patch3: scim-sunpinyin-scons-on-py3.patch
BuildRequires: gcc-c++
%if 0%{?sles_version}
BuildRequires: gtk2-devel
@@ -67,6 +69,7 @@
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
scons --prefix=/usr --libdir=%{_libdir}
++ scim-sunpinyin-scons-on-py3.patch ++
Index: scim-sunpinyin-2.0.3/SConstruct
===
--- scim-sunpinyin-2.0.3.orig/SConstruct
+++ scim-sunpinyin-2.0.3/SConstruct
@@ -26,7 +26,7 @@ opts.Add('DATADIR', default='/usr/local/
def PassVariables(envvar, env):
for (x, y) in envvar:
if x in os.environ:
-print 'Warning: you\'ve set %s in the environmental variable!' % x
+print ('Warning: you\'ve set %s in the environmental variable!' %
x)
env[y] = os.environ[x]
env = Environment(ENV=os.environ,
commit scim-sunpinyin for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.scim-sunpinyin.new/scim-sunpinyin.changes
2013-07-24 17:29:39.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.H6L2Ja/_new 2013-07-24 17:29:39.0 +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 fjk...@suse.com
+Patch1: scim-sunpinyin-remove-old-functions.patch
+#BuildRequires gtk3-devel fjk...@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 fjk...@suse.com
-Patch1: scim-sunpinyin-remove-old-functions.patch
-#BuildRequires gtk3-devel fjk...@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.zh...@sun.com
-Ervin Yan ervin@sun.com
-Yong Sun m...@yongsun.me
-Kefu Chai tchai...@gmail.com
-Wei Xue wei@sun.com
-Leo Zheng zym...@gmail.com
-chumsdock vor...@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+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
