diff --git a/ibus-sunpinyin-2.0.3.tar.gz b/ibus-sunpinyin-2.0.3.tar.gz deleted file mode 100644 index 1fcdfd2..0000000 --- a/ibus-sunpinyin-2.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c15b89d683318f3b1f3475dcabf7a91ee815692b233a289bcadab3ab7f8fa3c -size 218785 diff --git a/ibus-sunpinyin-scons-on-py3.patch b/ibus-sunpinyin-scons-on-py3.patch new file mode 100644 index 0000000..cf05354 --- /dev/null +++ b/ibus-sunpinyin-scons-on-py3.patch @@ -0,0 +1,65 @@ +Index: sunpinyin-3.0.0-rc1/SConstruct +=================================================================== +--- sunpinyin-3.0.0-rc1.orig/SConstruct ++++ sunpinyin-3.0.0-rc1/SConstruct +@@ -1,6 +1,7 @@ + import platform + import os + import sys ++import functools + + + version = "2.0.4" +@@ -227,7 +228,7 @@ def CreateEnvironment(): + 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 = CreateEnvironment() +@@ -427,7 +428,7 @@ env.Substfile('sunpinyin-2.0.pc.in', SUB + '@PREFIX@': env['PREFIX'], + '@LIBDIR@': env['LIBDIR'], + '@VERSION@': version, +- '@CFLAGS@': reduce(lambda a, b: a + ' ' + b, ++ '@CFLAGS@': functools.reduce(lambda a, b: a + ' ' + b, + map(lambda x: '-I$${includedir}' + x[3:], + allinc())), + }) +Index: sunpinyin-3.0.0-rc1/src/SConscript +=================================================================== +--- sunpinyin-3.0.0-rc1.orig/src/SConscript ++++ sunpinyin-3.0.0-rc1/src/SConscript +@@ -53,7 +53,7 @@ env.Substfile('sunpinyin-dictgen.mk.in', + }) + env.Command('sunpinyin-dictgen', 'sunpinyin-dictgen.mk', [ + Copy("$TARGET", "$SOURCE"), +- Chmod("$TARGET", 0755), ++ Chmod("$TARGET", 0o755), + ]) + + # -*- indent-tabs-mode: nil -*- vim:et:ts=4 +Index: sunpinyin-3.0.0-rc1/wrapper/ibus/SConstruct +=================================================================== +--- sunpinyin-3.0.0-rc1.orig/wrapper/ibus/SConstruct ++++ sunpinyin-3.0.0-rc1/wrapper/ibus/SConstruct +@@ -36,7 +36,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, +@@ -141,7 +141,7 @@ def DoInstall(): + libexec_target = env.Install(bin_dir, ['ibus-engine-sunpinyin', + 'setup/ibus-setup-sunpinyin']) + for exec_bin in libexec_target: +- env.AddPostAction(exec_bin, Chmod(str(exec_bin), 0755)) ++ env.AddPostAction(exec_bin, Chmod(str(exec_bin), 0o755)) + + setup_target = env.Install(data_dir + '/setup', + ['setup/setup.xml', diff --git a/ibus-sunpinyin.changes b/ibus-sunpinyin.changes index bc08ea6..dd51be3 100644 --- a/ibus-sunpinyin.changes +++ b/ibus-sunpinyin.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Fri Apr 13 08:09:00 UTC 2018 - hillwood@opensuse.org + +- Drop Provides tag, make sure python2 won't be automatically installed + +------------------------------------------------------------------- +Thu Nov 23 17:08:29 UTC 2017 - dimstar@opensuse.org + +- Add ibus-sunpinyin-scons-on-py3.patch: Fix build with scons using + pythoh3 as interpreter. + +------------------------------------------------------------------- +Tue Sep 12 02:51:46 UTC 2017 - hillwood@opensuse.org + +- Update to 3.0.0rc1 + * fixed the cursor_up(): ccd1cd1 + * added the setup tag: a43d055 + * add init status prefs: 0876aee + * hacks for working on GNOME3.6 with Emacs: 346afe8 + * fixed garble menu label for ibus wrapper: 40b66fb +- Fix Doc filelist + +------------------------------------------------------------------- +Thu Jun 1 12:52:25 UTC 2017 - qzhao@suse.com + +- Update ibus-sunpinyin.spec add install requires to sunpinyin-data + which is necessary for sunpinyin running (boo#1042182). + +------------------------------------------------------------------- +Wed May 24 04:30:03 UTC 2017 - qzhao@suse.com + +- Add is_opensuse macro in SPEC file, limit sunpinyin installation + not by default in SLE. + ------------------------------------------------------------------- Sat Jul 20 22:53:41 CST 2013 - hillwood@linuxfans.org diff --git a/ibus-sunpinyin.spec b/ibus-sunpinyin.spec index f5b8f9d..73eec39 100644 --- a/ibus-sunpinyin.spec +++ b/ibus-sunpinyin.spec @@ -1,7 +1,7 @@ # # spec file for package ibus-sunpinyin # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,26 +17,24 @@ Name: ibus-sunpinyin -Version: 2.0.3 +Version: 2.0.99 Release: 0 Summary: Sunpinyin module for ibus -License: LGPL-2.1 or CDDL-1.0 +License: LGPL-2.1-only OR CDDL-1.0 Group: System/I18n/Chinese -Url: http://code.google.com/p/sunpinyin/ +Url: https://github.com/sunpinyin/sunpinyin +Source: https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1/sunpinyin-3.0.0-rc1.tar.gz +# PATCH-FIX-UPSTREAM ibus-sunpinyin-scons-on-py3.patch dimstar@opensuse.org -- Fix build with scons using python3 as interpreter +Patch0: ibus-sunpinyin-scons-on-py3.patch BuildRequires: gcc-c++ -BuildRequires: ibus-devel BuildRequires: intltool -BuildRequires: libsunpinyin-devel -BuildRequires: python-devel BuildRequires: scons >= 1.2.0 -%if 0%{?suse_version} -BuildRequires: sqlite3-devel -%else -BuildRequires: sqlite-devel -%endif -Source: http://sunpinyin.googlecode.com/files/ibus-sunpinyin-%{version}.tar.gz -Provides: locale(ibus:zh_CN;zh_SG) +BuildRequires: pkgconfig(ibus-1.0) +BuildRequires: pkgconfig(python2) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(sunpinyin-2.0) Requires: python-ibus +Requires: sunpinyin-data BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,22 +42,33 @@ ibus-sunpinyin is a wrapper around SunPinyin which enables user to use SunPinyin with IBus framework. %prep -%setup -q +%setup -q -n sunpinyin-3.0.0-rc1 +%patch0 -p1 sed -i "s/LIBEXECDIR'\].*ibus-sunpinyin.*/LIBEXECDIR'\]/" SConstruct %build -scons --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libdir}/ibus +cd wrapper/ibus/ +scons --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libdir} %install -scons install --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libdir}/ibus --install-sandbox=%{buildroot} +pushd wrapper/ibus/ +scons install --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libdir} \ + --install-sandbox=%{buildroot} +popd %find_lang %{name} %files -f %{name}.lang %defattr(-,root,root) -%doc README COPYING -%{_libdir}/ibus/ibus-engine-sunpinyin -%{_libdir}/ibus/ibus-setup-sunpinyin +%doc wrapper/ibus/README wrapper/ibus/COPYING +%doc wrapper/ibus/LGPL.LICENSE wrapper/ibus/OPENSOLARIS.LICENSE +%dir %{_libdir}/%{name} +%{_libdir}/%{name}/ibus-engine-sunpinyin +%{_libdir}/%{name}/ibus-setup-sunpinyin %{_datadir}/%{name} %{_datadir}/ibus/component/sunpinyin.xml diff --git a/sunpinyin-3.0.0-rc1.tar.gz b/sunpinyin-3.0.0-rc1.tar.gz new file mode 100644 index 0000000..325e527 --- /dev/null +++ b/sunpinyin-3.0.0-rc1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:692455b645803bfc6c2e53151bb9ccbae1a4b813a18d87607d19d14ae9354780 +size 547138