From 4787ce7636ae6e74fda40994f6733548b5428c65 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:11:44 -0500 Subject: [PATCH 01/63] Rebuild for new libpng --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 28ecb58..0db9d54 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -2,7 +2,7 @@ Name: sunpinyin Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -194,6 +194,9 @@ fi %config %{_xinputconf} %changelog +* Tue Dec 06 2011 Adam Jackson - 2.0.3-2 +- Rebuild for new libpng + * Fri Feb 18 2011 Howard Ning - 2.0.3-1 - New upstream From 515a44537b380f1bca4adca1ea23af68e58886e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 23:57:30 -0600 Subject: [PATCH 02/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 0db9d54..b0a632a 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -2,7 +2,7 @@ Name: sunpinyin Version: 2.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -194,6 +194,9 @@ fi %config %{_xinputconf} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 2.0.3-2 - Rebuild for new libpng From df169a05ed89a60288800ec8c281f5bf61ccda06 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 6 Mar 2012 14:21:11 +0800 Subject: [PATCH 03/63] rebuilt for ibus --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index b0a632a..4e71b7f 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -2,7 +2,7 @@ Name: sunpinyin Version: 2.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -194,6 +194,9 @@ fi %config %{_xinputconf} %changelog +* Tue Mar 06 2012 Peng Wu - 2.0.3-4 +- Rebuilt for ibus-1.4.99 + * Sat Jan 14 2012 Fedora Release Engineering - 2.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From c865998d08ab237a77bd8ff03f706013a9c5687e Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 6 Mar 2012 15:27:33 +0800 Subject: [PATCH 04/63] fixes compile --- sunpinyin-fixes-unistd-compile.patch | 24 ++++++++++++++++++++++++ sunpinyin.spec | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 sunpinyin-fixes-unistd-compile.patch diff --git a/sunpinyin-fixes-unistd-compile.patch b/sunpinyin-fixes-unistd-compile.patch new file mode 100644 index 0000000..76ff682 --- /dev/null +++ b/sunpinyin-fixes-unistd-compile.patch @@ -0,0 +1,24 @@ +Index: sunpinyin-2.0.3/src/lexicon/genPYT.cpp +=================================================================== +--- sunpinyin-2.0.3.orig/src/lexicon/genPYT.cpp ++++ sunpinyin-2.0.3/src/lexicon/genPYT.cpp +@@ -37,6 +37,7 @@ + + #include + #include ++#include + + #include "pytrie.h" + #include "pytrie_gen.h" +Index: sunpinyin-2.0.3/src/ime-core/ic_history.cpp +=================================================================== +--- sunpinyin-2.0.3.orig/src/ime-core/ic_history.cpp ++++ sunpinyin-2.0.3/src/ime-core/ic_history.cpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + #include "ic_history.h" + diff --git a/sunpinyin.spec b/sunpinyin.spec index 4e71b7f..cdeaf76 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -11,6 +11,7 @@ Source0: http://sunpinyin.googlecode.com/files/%{name}-all-in-one-%{version}.tar Source1: xinput-x%{name} Source2: http://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2 Source3: http://open-gram.googlecode.com/files/dict.utf8.tar.bz2 +Patch0: sunpinyin-fixes-unistd-compile.patch BuildRequires: sqlite-devel BuildRequires: gtk2-devel BuildRequires: ibus-devel @@ -83,6 +84,7 @@ the same way as fcitx does. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .unistd # Hack to honor correct compiler flags sed -i 's/-O2 -pipe/%{optflags}/' SConstruct From fc0e3df2d67468512102ac8db543906818fb9f07 Mon Sep 17 00:00:00 2001 From: Fedora Date: Sun, 13 May 2012 17:04:23 +0800 Subject: [PATCH 05/63] Upstream to the latest git snapshot of sunpinyin --- .gitignore | 1 + make-git-snapshot.sh | 22 ++++++++++++++++++++++ sources | 6 +++--- sunpinyin.spec | 34 +++++++++++++++++++++------------- 4 files changed, 47 insertions(+), 16 deletions(-) create mode 100755 make-git-snapshot.sh diff --git a/.gitignore b/.gitignore index c3c137c..2e1fd0f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /sunpinyin-all-in-one-2.0.3.tar.gz /lm_sc.t3g.arpa.tar.bz2 /dict.utf8.tar.bz2 +/sunpinyin-20120513.tar.xz diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..b0d7dd6 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Usage: ./make-git-snapshot.sh [COMMIT] +# +# to make a snapshot of the given tag/branch. Defaults to HEAD. +# Point env var REF to a local mesa repo to reduce clone time. + +DIRNAME=sunpinyin-$( date +%Y%m%d ) + +echo REF ${REF:+--reference $REF} +echo DIRNAME $DIRNAME +echo HEAD ${1:-HEAD} + +rm -rf $DIRNAME + +git clone ${REF:+--reference $REF} \ + git://github.com/sunpinyin/sunpinyin.git $DIRNAME + +GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | xz > $DIRNAME.tar.xz + +# rm -rf $DIRNAME diff --git a/sources b/sources index 718df4f..61dc3a9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ffd79b94e88fc160bec7056d8e68d1c2 sunpinyin-all-in-one-2.0.3.tar.gz -d75be3b5472cb06ad634261aa4aa22b5 lm_sc.t3g.arpa.tar.bz2 -7b996004c761f8a190a34df25d64668b dict.utf8.tar.bz2 +67e470436e1fb43589e7ff253ef63285 sunpinyin-20120513.tar.xz +31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 +98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 diff --git a/sunpinyin.spec b/sunpinyin.spec index cdeaf76..7446829 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,23 +1,25 @@ %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf +%define gitdate 20120513 Name: sunpinyin -Version: 2.0.3 -Release: 4%{?dist} +Version: 2.0.4 +Release: 0.1%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ -Source0: http://sunpinyin.googlecode.com/files/%{name}-all-in-one-%{version}.tar.gz +Source0: %{name}-%{gitdate}.tar.xz Source1: xinput-x%{name} Source2: http://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2 Source3: http://open-gram.googlecode.com/files/dict.utf8.tar.bz2 -Patch0: sunpinyin-fixes-unistd-compile.patch +#Patch0: sunpinyin-fixes-unistd-compile.patch BuildRequires: sqlite-devel BuildRequires: gtk2-devel BuildRequires: ibus-devel BuildRequires: gettext BuildRequires: scons -%ifarch %{ix86} x86_64 armv5tel mips64el +BuildRequires: python-devel +%ifarch %{ix86} x86_64 armv5tel mips64el armv7hl Requires: %{name}-data-le %else Requires: %{name}-data-be @@ -83,8 +85,8 @@ This package provides a XIM server with SunPinyin input method. It works much the same way as fcitx does. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .unistd +%setup -q -n %{name}-%{gitdate} +#%patch0 -p1 -b .unistd # Hack to honor correct compiler flags sed -i 's/-O2 -pipe/%{optflags}/' SConstruct @@ -93,18 +95,18 @@ sed -i 's/-O2 -pipe/%{optflags}/' wrapper/{ibus,xim}/SConstruct # Fix libexecdir path for ibus-sunpinyin sed -i 's\lib/ibus-sunpinyin\libexec\' wrapper/ibus/SConstruct -cp %SOURCE2 %{_builddir}/%{name}-%{version}/raw -cp %SOURCE3 %{_builddir}/%{name}-%{version}/raw +cp %SOURCE2 %{_builddir}/%{name}-%{gitdate}/raw +cp %SOURCE3 %{_builddir}/%{name}-%{gitdate}/raw %build scons %{?_smp_mflags} --prefix=%{_prefix} # We need to do this so wrappers can link against libsunpinyin -sed -i 's\libdir=.*$\libdir=%{_builddir}/%{name}-%{version}\' sunpinyin-*.pc -sed -i 's\includedir=.*$\includedir=%{_builddir}/%{name}-%{version}/src\' sunpinyin-*.pc +sed -i 's\libdir=.*$\libdir=%{_builddir}/%{name}-%{gitdate}\' sunpinyin-*.pc +sed -i 's\includedir=.*$\includedir=%{_builddir}/%{name}-%{gitdate}/src\' sunpinyin-*.pc cp -p sunpinyin-2.0.pc sunpinyin-2.0.pc.bak ln -s libsunpinyin*.so libsunpinyin.so -export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{version} +export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate} pushd wrapper/ibus scons %{?_smp_mflags} --prefix=%{_prefix} @@ -127,7 +129,7 @@ sed -i 's\{exec_prefix}/lib\{exec_prefix}/%{_lib}\' \ # Put them back so the install doesn't fail cp -p sunpinyin-2.0.pc.bak sunpinyin-2.0.pc -export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{version} +export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate} pushd wrapper/ibus scons %{?_smp_mflags} --prefix=%{_prefix} install --install-sandbox=%{buildroot} @@ -196,6 +198,12 @@ fi %config %{_xinputconf} %changelog +* Sun May 13 2012 Liang Suilong - 2.0.4-0.1 +- Upstream to the latest git snapshot +- Add BR: python-devel +- Upgrade to the latest SLM Data +- Drop the patch: sunpinyin-fixes-unistd-compile.patch + * Tue Mar 06 2012 Peng Wu - 2.0.3-4 - Rebuilt for ibus-1.4.99 From dca43c7ac3ac2e3f1c3f3bf11b6a72efabea6f06 Mon Sep 17 00:00:00 2001 From: Fedora Date: Sun, 3 Jun 2012 21:59:12 +0800 Subject: [PATCH 06/63] Upstream to the latest git snapshot --- .gitignore | 1 + sources | 4 +--- sunpinyin.spec | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2e1fd0f..09f81c9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /lm_sc.t3g.arpa.tar.bz2 /dict.utf8.tar.bz2 /sunpinyin-20120513.tar.xz +/sunpinyin-20120603.tar.xz diff --git a/sources b/sources index 61dc3a9..c90f121 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -67e470436e1fb43589e7ff253ef63285 sunpinyin-20120513.tar.xz -31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 -98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 +dff4b45654fdfbf978ee987dc2d4c725 sunpinyin-20120603.tar.xz diff --git a/sunpinyin.spec b/sunpinyin.spec index 7446829..ce550cf 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,9 +1,9 @@ %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf -%define gitdate 20120513 +%define gitdate 20120603 Name: sunpinyin Version: 2.0.4 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -198,6 +198,9 @@ fi %config %{_xinputconf} %changelog +* Sun Jun 03 2012 Liang Suilong - 2.0.4-0.2 +- Upstream to the latest git snapshot + * Sun May 13 2012 Liang Suilong - 2.0.4-0.1 - Upstream to the latest git snapshot - Add BR: python-devel From e5f62276519772ff9cbb63cc0beb0227b68cb37f Mon Sep 17 00:00:00 2001 From: Fedora Date: Sun, 3 Jun 2012 22:14:14 +0800 Subject: [PATCH 07/63] Fix source tarball --- sources | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources b/sources index c90f121..c6dd4cd 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ dff4b45654fdfbf978ee987dc2d4c725 sunpinyin-20120603.tar.xz +31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 +98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 From c14a5493ebaf70a9e05e1ba2802d6b36b0597cce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 17:02:20 -0500 Subject: [PATCH 08/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index ce550cf..dd04f83 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -198,6 +198,9 @@ fi %config %{_xinputconf} %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 2.0.4-0.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sun Jun 03 2012 Liang Suilong - 2.0.4-0.2 - Upstream to the latest git snapshot From 4189e81bf7d2b093eb7aff0dbcf636771c339fa2 Mon Sep 17 00:00:00 2001 From: Fedora Date: Thu, 26 Jul 2012 00:11:44 +0800 Subject: [PATCH 09/63] Upstream to the latest git snapshot --- .gitignore | 1 + sources | 1 + sunpinyin.spec | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 09f81c9..abc6744 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dict.utf8.tar.bz2 /sunpinyin-20120513.tar.xz /sunpinyin-20120603.tar.xz +/sunpinyin-20120726.tar.xz diff --git a/sources b/sources index c6dd4cd..6dc0a79 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ dff4b45654fdfbf978ee987dc2d4c725 sunpinyin-20120603.tar.xz 31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 +cf468879001ad00a28c1a889fd863fc2 sunpinyin-20120726.tar.xz diff --git a/sunpinyin.spec b/sunpinyin.spec index ce550cf..d4b3321 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,9 +1,9 @@ %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf -%define gitdate 20120603 +%define gitdate 20120726 Name: sunpinyin Version: 2.0.4 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -198,6 +198,9 @@ fi %config %{_xinputconf} %changelog +* Thu Jul 26 2012 Liang Suilong - 2.0.4-0.3 +- Upstream to the latest git snapshot + * Sun Jun 03 2012 Liang Suilong - 2.0.4-0.2 - Upstream to the latest git snapshot From f95fe7d2b01acbd56f2d878a3bf8eba73eab04a8 Mon Sep 17 00:00:00 2001 From: Fedora Date: Thu, 26 Jul 2012 00:14:46 +0800 Subject: [PATCH 10/63] Fix the spec --- sunpinyin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 12fbde3..65abfba 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -198,7 +198,6 @@ fi %config %{_xinputconf} %changelog -<<<<<<< HEAD * Thu Jul 26 2012 Liang Suilong - 2.0.4-0.4 - Upstream to the latest git snapshot From 9c61cea38b4f5b0153a1d029c541ed8dbbcbc486 Mon Sep 17 00:00:00 2001 From: Fedora Date: Sun, 29 Jul 2012 04:56:14 +0800 Subject: [PATCH 11/63] Fix spec error --- sunpinyin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 65abfba..29853b5 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -105,7 +105,7 @@ scons %{?_smp_mflags} --prefix=%{_prefix} sed -i 's\libdir=.*$\libdir=%{_builddir}/%{name}-%{gitdate}\' sunpinyin-*.pc sed -i 's\includedir=.*$\includedir=%{_builddir}/%{name}-%{gitdate}/src\' sunpinyin-*.pc cp -p sunpinyin-2.0.pc sunpinyin-2.0.pc.bak -ln -s libsunpinyin*.so libsunpinyin.so +ln -s libsunpinyin.so.3.0 libsunpinyin.so export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate} pushd wrapper/ibus From 7ecdc3b27984367f609c51483e67d74e811d05c2 Mon Sep 17 00:00:00 2001 From: Fedora Date: Sun, 29 Jul 2012 17:57:59 +0800 Subject: [PATCH 12/63] Fix the spec file for building fcitx-sunpinyin --- sunpinyin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 29853b5..0f9c5d9 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.4%{?dist} +Release: 0.5%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -102,9 +102,9 @@ cp %SOURCE3 %{_builddir}/%{name}-%{gitdate}/raw scons %{?_smp_mflags} --prefix=%{_prefix} # We need to do this so wrappers can link against libsunpinyin +cp -p sunpinyin-2.0.pc sunpinyin-2.0.pc.bak sed -i 's\libdir=.*$\libdir=%{_builddir}/%{name}-%{gitdate}\' sunpinyin-*.pc sed -i 's\includedir=.*$\includedir=%{_builddir}/%{name}-%{gitdate}/src\' sunpinyin-*.pc -cp -p sunpinyin-2.0.pc sunpinyin-2.0.pc.bak ln -s libsunpinyin.so.3.0 libsunpinyin.so export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate} @@ -198,6 +198,9 @@ fi %config %{_xinputconf} %changelog +* Sun Jul 28 2012 Liang Suilong - 2.0.4-0.5 +- Fix the spec file for building fcitx-sunpinyin + * Thu Jul 26 2012 Liang Suilong - 2.0.4-0.4 - Upstream to the latest git snapshot From caca29ea8b8aac2c4208ba138bf9d128b52d2387 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 18:56:53 -0600 Subject: [PATCH 13/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 0f9c5d9..0fc8f5c 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.5%{?dist} +Release: 0.6%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -198,6 +198,9 @@ fi %config %{_xinputconf} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 2.0.4-0.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 28 2012 Liang Suilong - 2.0.4-0.5 - Fix the spec file for building fcitx-sunpinyin From 2c4175382f4ef1c9e9969dcfca411d0ea6179f0b Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sat, 23 Feb 2013 19:39:22 +0800 Subject: [PATCH 14/63] remove built-in wrapper --- make-git-snapshot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh index b0d7dd6..eda5e48 100755 --- a/make-git-snapshot.sh +++ b/make-git-snapshot.sh @@ -17,6 +17,7 @@ git clone ${REF:+--reference $REF} \ git://github.com/sunpinyin/sunpinyin.git $DIRNAME GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ + | rm -rf $DIRNAME/wrapper \ | xz > $DIRNAME.tar.xz # rm -rf $DIRNAME From 4274b0e3147a90301ec5fa0a612fdefffde3e471 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sat, 23 Feb 2013 19:43:57 +0800 Subject: [PATCH 15/63] Upload new source tarball --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index abc6744..690e9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /sunpinyin-20120513.tar.xz /sunpinyin-20120603.tar.xz /sunpinyin-20120726.tar.xz +/sunpinyin-20130223.tar.xz diff --git a/sources b/sources index 6dc0a79..8e6cc0d 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ dff4b45654fdfbf978ee987dc2d4c725 sunpinyin-20120603.tar.xz 31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 cf468879001ad00a28c1a889fd863fc2 sunpinyin-20120726.tar.xz +8dc5aea5b03dff8595f096f9e368e888 sunpinyin-20130223.tar.xz From 6bb90fa48bbf35982ff46b6b2b9558c8c4d6a33f Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sun, 24 Feb 2013 01:43:12 +0800 Subject: [PATCH 16/63] Upload new git snapshot --- .gitignore | 1 + make-git-snapshot.sh | 6 +++--- sources | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 690e9ec..9fd117f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /sunpinyin-20120603.tar.xz /sunpinyin-20120726.tar.xz /sunpinyin-20130223.tar.xz +/sunpinyin-20130224.tar.xz diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh index eda5e48..340d45a 100755 --- a/make-git-snapshot.sh +++ b/make-git-snapshot.sh @@ -16,8 +16,8 @@ rm -rf $DIRNAME git clone ${REF:+--reference $REF} \ git://github.com/sunpinyin/sunpinyin.git $DIRNAME -GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ - | rm -rf $DIRNAME/wrapper \ - | xz > $DIRNAME.tar.xz +rm -rf $DIRNAME/wrapper + +tar cf $DIRNAME.tar.xz $DIRNAME # rm -rf $DIRNAME diff --git a/sources b/sources index 8e6cc0d..5b55ab4 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ -dff4b45654fdfbf978ee987dc2d4c725 sunpinyin-20120603.tar.xz 31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 -cf468879001ad00a28c1a889fd863fc2 sunpinyin-20120726.tar.xz -8dc5aea5b03dff8595f096f9e368e888 sunpinyin-20130223.tar.xz +a98ee690754eeaa796a4a540f170b941 sunpinyin-20130224.tar.xz From 7a6cd696ab034bf9fe1d679754f04f9aece1daf8 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sun, 24 Feb 2013 04:16:53 +0800 Subject: [PATCH 17/63] Drop ibus-sunpinyin Drop xsunpinyin Update sunpinyin data file Architecture-dependent data file --- .gitignore | 2 + sources | 2 + sunpinyin.spec | 169 +++++++++++-------------------------------------- 3 files changed, 40 insertions(+), 133 deletions(-) diff --git a/.gitignore b/.gitignore index 9fd117f..1f27e40 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /sunpinyin-20120726.tar.xz /sunpinyin-20130223.tar.xz /sunpinyin-20130224.tar.xz +/lm_sc.t3g.arpa-20121025.tar.bz2 +/dict.utf8-20130220.tar.bz2 diff --git a/sources b/sources index 5b55ab4..1b40a9f 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ 31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 a98ee690754eeaa796a4a540f170b941 sunpinyin-20130224.tar.xz +0586241ca33359ad176c842c90bf563e lm_sc.t3g.arpa-20121025.tar.bz2 +1e95894a4a3d8923e86e7b78c77ac815 dict.utf8-20130220.tar.bz2 diff --git a/sunpinyin.spec b/sunpinyin.spec index 0fc8f5c..afa8bab 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,29 +1,20 @@ %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf -%define gitdate 20120726 +%define gitdate 20130224 Name: sunpinyin Version: 2.0.4 -Release: 0.6%{?dist} +Release: 0.7%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz -Source1: xinput-x%{name} -Source2: http://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2 -Source3: http://open-gram.googlecode.com/files/dict.utf8.tar.bz2 -#Patch0: sunpinyin-fixes-unistd-compile.patch +Source2: http://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2 +Source3: http://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 BuildRequires: sqlite-devel -BuildRequires: gtk2-devel -BuildRequires: ibus-devel BuildRequires: gettext BuildRequires: scons BuildRequires: python-devel -%ifarch %{ix86} x86_64 armv5tel mips64el armv7hl -Requires: %{name}-data-le -%else -Requires: %{name}-data-be -%endif %description Sunpinyin is an input method engine for Simplified Chinese. It is an SLM based @@ -41,108 +32,41 @@ Requires: %{name} = %{version}-%{release} The %{name}-devel package contains libraries and header files that allows user to write their own front-end for sunpinyin. -%package data-le +%package data Summary: Little-endian data files for %{name} Group: System Environment/Libraries License: CC-BY-SA -Conflicts: %{name}-data-be -BuildArch: noarch +Obsoletes: %{name}-data-le +Obsoletes: %{name}-data-be -%description data-le +%description data The %{name}-data package contains necessary lexicon data and its index data -files needed by the sunpinyin input methods on little endian architectures. - -%package data-be -Summary: Big-endian data files for %{name} -Group: System Environment/Libraries -License: CC-BY-SA -Conflicts: %{name}-data-le -BuildArch: noarch - -%description data-be -The %{name}-data package contains necessary lexicon data and its index data -files needed by the sunpinyin input methods on big endian architectures. - -%package -n ibus-%{name} -Summary: Sunpinyin input method engine for ibus -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Requires: ibus - -%description -n ibus-%{name} -This package provides SunPinyin input method for IBus framework. - -%package -n x%{name} -Summary: Standalone XIM server for Sunpinyin -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Requires: im-chooser -Requires(post): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives - -%description -n x%{name} -This package provides a XIM server with SunPinyin input method. It works much -the same way as fcitx does. +files needed by the sunpinyin input methods. %prep %setup -q -n %{name}-%{gitdate} -#%patch0 -p1 -b .unistd - -# Hack to honor correct compiler flags -sed -i 's/-O2 -pipe/%{optflags}/' SConstruct -sed -i 's/-O2 -pipe/%{optflags}/' wrapper/{ibus,xim}/SConstruct - -# Fix libexecdir path for ibus-sunpinyin -sed -i 's\lib/ibus-sunpinyin\libexec\' wrapper/ibus/SConstruct - -cp %SOURCE2 %{_builddir}/%{name}-%{gitdate}/raw -cp %SOURCE3 %{_builddir}/%{name}-%{gitdate}/raw - -%build -scons %{?_smp_mflags} --prefix=%{_prefix} - -# We need to do this so wrappers can link against libsunpinyin -cp -p sunpinyin-2.0.pc sunpinyin-2.0.pc.bak -sed -i 's\libdir=.*$\libdir=%{_builddir}/%{name}-%{gitdate}\' sunpinyin-*.pc -sed -i 's\includedir=.*$\includedir=%{_builddir}/%{name}-%{gitdate}/src\' sunpinyin-*.pc -ln -s libsunpinyin.so.3.0 libsunpinyin.so -export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate} - -pushd wrapper/ibus -scons %{?_smp_mflags} --prefix=%{_prefix} +mkdir -p raw +cp %SOURCE2 raw +cp %SOURCE3 raw +pushd raw +tar xvf lm_sc.t3g.arpa-20121025.tar.bz2 +tar xvf dict.utf8-20130220.tar.bz2 popd -pushd wrapper/xim -scons %{?_smp_mflags} --prefix=%{_prefix} +%build +scons %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} --datadir=%{_datadir} +export PATH=`pwd`/src:$PATH +pushd raw +ln -sf ../doc/SLM-inst.mk Makefile +make %{?_smp_mflags} VERBOSE=1 popd %install -scons %{?_smp_mflags} --prefix=%{_prefix} install --install-sandbox=%{buildroot} - -%if %{_lib}==lib64 -mkdir -p %{buildroot}%{_libdir} -mv %{buildroot}%{_prefix}/lib/*.so* %{buildroot}%{_libdir} -mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_libdir}/pkgconfig -sed -i 's\{exec_prefix}/lib\{exec_prefix}/%{_lib}\' \ - %{buildroot}%{_libdir}/pkgconfig/sunpinyin-2.0.pc -%endif - -# Put them back so the install doesn't fail -cp -p sunpinyin-2.0.pc.bak sunpinyin-2.0.pc -export PKG_CONFIG_PATH=%{_builddir}/%{name}-%{gitdate} - -pushd wrapper/ibus -scons %{?_smp_mflags} --prefix=%{_prefix} install --install-sandbox=%{buildroot} +scons %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} --datadir=%{_datadir} install --install-sandbox=%{buildroot} +pushd raw +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" popd -pushd wrapper/xim -scons %{?_smp_mflags} --prefix=%{_prefix} install --install-sandbox=%{buildroot} -popd - -# install xinput config file -install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf} -%find_lang ibus-%{name} - %clean rm -rf %{buildroot} @@ -150,24 +74,12 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%post -n x%{name} -%{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc \ - %{_xinputconf} 50 || : - -%postun -n x%{name} -if [ "$1" = "0" ]; then - %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || : - # if alternative was set to manual, reset to auto - [ -L %{_sysconfdir}/alternatives/xinputrc -a \ - "`readlink %{_sysconfdir}/alternatives/xinputrc`" = \ - "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || : -fi - %files %defattr(-,root,root,-) %doc AUTHORS COPYING *.LICENSE %doc README TODO %{_libdir}/libsunpinyin*.so.* +%{_docdir}/%{name}/README %files devel %defattr(-,root,root,-) @@ -175,29 +87,20 @@ fi %{_libdir}/pkgconfig/sunpinyin*.pc %{_includedir}/sunpinyin* -%ifarch %{ix86} x86_64 armv5tel mips64el -%files data-le +%files data %defattr(-,root,root,-) -%{_prefix}/lib/%{name} -%else -%files data-be -%defattr(-,root,root,-) -%{_prefix}/lib/%{name} -%endif - -%files -n ibus-%{name} -f ibus-%{name}.lang -%defattr(-,root,root,-) -%{_prefix}/lib/ibus-sunpinyin/ibus* -%{_datadir}/ibus/component/* -%{_datadir}/ibus-%{name} - -%files -n x%{name} -%defattr(-,root,root,-) -%{_bindir}/x%{name}* -%{_datadir}/x%{name} -%config %{_xinputconf} +%{_datadir}/%{name} +%{_bindir}/* +%{_mandir}/man1/*.1.gz +%{_docdir}/%{name}/SLM-*.mk %changelog +* Sun Feb 24 2013 Liang Suilong - 2.0.4-0.7 +- Drop ibus-sunpinyin +- Drop xsunpinyin +- Architecture-dependent data file +- Upstream sunpinyin data file + * Fri Feb 15 2013 Fedora Release Engineering - 2.0.4-0.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 286577f4f7934f79c4dc81f484571bd54bf17842 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sun, 24 Feb 2013 10:47:29 +0800 Subject: [PATCH 18/63] add BR: perl --- sunpinyin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sunpinyin.spec b/sunpinyin.spec index afa8bab..fecd4f6 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -14,6 +14,7 @@ Source3: http://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 BuildRequires: sqlite-devel BuildRequires: gettext BuildRequires: scons +BuildRequires: perl BuildRequires: python-devel %description From d10ea857be56186a152102e339a8c60bffcc8700 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sun, 24 Feb 2013 11:07:46 +0800 Subject: [PATCH 19/63] fix BRs, need perl(Pod::Man) --- sunpinyin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index fecd4f6..3811ceb 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -14,7 +14,7 @@ Source3: http://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 BuildRequires: sqlite-devel BuildRequires: gettext BuildRequires: scons -BuildRequires: perl +BuildRequires: perl(Pod::Man) BuildRequires: python-devel %description From 754c8ea0ee7c52722d15924ccd8fc5d767860de1 Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Wed, 10 Jul 2013 00:29:20 +0800 Subject: [PATCH 20/63] Upstream to sunpinyin latest git snapshot --- .gitignore | 1 + sources | 1 + sunpinyin.spec | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1f27e40..bca8070 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /sunpinyin-20130224.tar.xz /lm_sc.t3g.arpa-20121025.tar.bz2 /dict.utf8-20130220.tar.bz2 +/sunpinyin-20130710.tar.xz diff --git a/sources b/sources index 1b40a9f..20770d3 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ a98ee690754eeaa796a4a540f170b941 sunpinyin-20130224.tar.xz 0586241ca33359ad176c842c90bf563e lm_sc.t3g.arpa-20121025.tar.bz2 1e95894a4a3d8923e86e7b78c77ac815 dict.utf8-20130220.tar.bz2 +f18f8b81d012bbfeb4a647e01af1635c sunpinyin-20130710.tar.xz diff --git a/sunpinyin.spec b/sunpinyin.spec index 3811ceb..c030d21 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,9 +1,9 @@ %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf -%define gitdate 20130224 +%define gitdate 20130710 Name: sunpinyin Version: 2.0.4 -Release: 0.7%{?dist} +Release: 0.8%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -96,6 +96,9 @@ rm -rf %{buildroot} %{_docdir}/%{name}/SLM-*.mk %changelog +* Wed Jul 10 2013 Liang Suilong - 2.0.4-0.8 +- Upstream to the latest git snapshot + * Sun Feb 24 2013 Liang Suilong - 2.0.4-0.7 - Drop ibus-sunpinyin - Drop xsunpinyin From 051e3cd85ea54869d8e48b6e3468ef350a62fbe3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 11:09:57 -0500 Subject: [PATCH 21/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index c030d21..5ead06f 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.8%{?dist} +Release: 0.9%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -96,6 +96,9 @@ rm -rf %{buildroot} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.0.4-0.9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 10 2013 Liang Suilong - 2.0.4-0.8 - Upstream to the latest git snapshot From 771cec8d53091776ec579f1bf7f8f5e66ce7ee45 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 02:40:48 -0500 Subject: [PATCH 22/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 5ead06f..01dc5e6 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.9%{?dist} +Release: 0.10%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -96,6 +96,9 @@ rm -rf %{buildroot} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.0.4-0.10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 2.0.4-0.9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 2e86fb7519bb697eeedc1cbdd7af8d5455975f8c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 16 Jun 2014 13:13:39 +0100 Subject: [PATCH 23/63] Handle AArch64 as well --- sunpinyin-aarch64.patch | 24 ++++++++++++++++++++++++ sunpinyin.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 sunpinyin-aarch64.patch diff --git a/sunpinyin-aarch64.patch b/sunpinyin-aarch64.patch new file mode 100644 index 0000000..0d2eaf8 --- /dev/null +++ b/sunpinyin-aarch64.patch @@ -0,0 +1,24 @@ +Index: sunpinyin-20130710/SConstruct +=================================================================== +--- sunpinyin-20130710.orig/SConstruct ++++ sunpinyin-20130710/SConstruct +@@ -313,7 +313,8 @@ def AppendEndianCheck(conf): + || defined(_POWER) || defined(__powerpc__) \ + || defined(__ppc__) || defined(__hpux) || defined(__hppa) \ + || defined(_MIPSEB) || defined(_POWER) \ +- || defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__)) ++ || defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__)) \ ++ || defined(__AARCH64EB__) + # define WORDS_BIGENDIAN 1 + + #elif defined(__i386__) || defined(__i386) \ +@@ -324,7 +325,8 @@ def AppendEndianCheck(conf): + || defined(__x86_64) || defined(__x86_64__) \ + || defined(_M_X64) || defined(__bfin__) \ + || defined(__alpha__) || defined(__ARMEL__) \ +- || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) ++ || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) \ ++ || defined(__AARCH64EL__) + # undef WORDS_BIGENDIAN + + #else diff --git a/sunpinyin.spec b/sunpinyin.spec index 01dc5e6..4e99709 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.10%{?dist} +Release: 0.11%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -11,6 +11,7 @@ URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz Source2: http://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2 Source3: http://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 +Patch0: sunpinyin-aarch64.patch BuildRequires: sqlite-devel BuildRequires: gettext BuildRequires: scons @@ -46,6 +47,7 @@ files needed by the sunpinyin input methods. %prep %setup -q -n %{name}-%{gitdate} +%patch0 -p1 mkdir -p raw cp %SOURCE2 raw cp %SOURCE3 raw @@ -96,6 +98,9 @@ rm -rf %{buildroot} %{_docdir}/%{name}/SLM-*.mk %changelog +* Mon Jun 16 2014 Marcin Juszkiewicz - 2.0.4-0.11 +- Handle AArch64 as well + * Sun Jun 08 2014 Fedora Release Engineering - 2.0.4-0.10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 0d05414d683b04a2971694d8e786928b70f48db0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 04:12:28 +0000 Subject: [PATCH 24/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 4e99709..5fb6c0e 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.11%{?dist} +Release: 0.12%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -98,6 +98,9 @@ rm -rf %{buildroot} %{_docdir}/%{name}/SLM-*.mk %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.0.4-0.12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Mon Jun 16 2014 Marcin Juszkiewicz - 2.0.4-0.11 - Handle AArch64 as well From d998789bec048eacb6a13d69f29778724b2ee472 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:03:10 +0200 Subject: [PATCH 25/63] Rebuilt for GCC 5 C++11 ABI change --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 5fb6c0e..a81a983 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.12%{?dist} +Release: 0.13%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -98,6 +98,9 @@ rm -rf %{buildroot} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat May 02 2015 Kalev Lember - 2.0.4-0.13 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 2.0.4-0.12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From e55022ae63b81e84a8e990fb9b2930a560ee82ec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:07:07 +0000 Subject: [PATCH 26/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index a81a983..13c0459 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.13%{?dist} +Release: 0.14%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -98,6 +98,9 @@ rm -rf %{buildroot} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.0.4-0.14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 2.0.4-0.13 - Rebuilt for GCC 5 C++11 ABI change From 38209071d9041dd395a5e6101894542237fcba8d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 29 Dec 2015 21:03:17 +0100 Subject: [PATCH 27/63] - Rawhide only: Fix pod2man invocation for perl-podlators >= 4. - Export global compiler flags before building. - Minor spec cleanup: remove %defattr usage and %clean section, use %license, add %_isa to -devel base package dependency, don't mix %buildroot and $RPM_BUILD_ROOT - Insert gitdate into release to follow snapshot guidelines. - Fix duplicated doc files (#1001266). - fix bogus date in %changelog - clean up old tarballs from "sources" file --- sources | 3 --- sunpinyin-20130710-pod2man-v4.patch | 15 ++++++++++++ sunpinyin.spec | 36 ++++++++++++++++++++--------- 3 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 sunpinyin-20130710-pod2man-v4.patch diff --git a/sources b/sources index 20770d3..d1efe9d 100644 --- a/sources +++ b/sources @@ -1,6 +1,3 @@ -31dd2667d9a5cae9d2ecdacf2201ab13 lm_sc.t3g.arpa.tar.bz2 -98b1dc61d3ef3fd4be3c0a9fac410da2 dict.utf8.tar.bz2 -a98ee690754eeaa796a4a540f170b941 sunpinyin-20130224.tar.xz 0586241ca33359ad176c842c90bf563e lm_sc.t3g.arpa-20121025.tar.bz2 1e95894a4a3d8923e86e7b78c77ac815 dict.utf8-20130220.tar.bz2 f18f8b81d012bbfeb4a647e01af1635c sunpinyin-20130710.tar.xz diff --git a/sunpinyin-20130710-pod2man-v4.patch b/sunpinyin-20130710-pod2man-v4.patch new file mode 100644 index 0000000..df13118 --- /dev/null +++ b/sunpinyin-20130710-pod2man-v4.patch @@ -0,0 +1,15 @@ +New pod2man would require --name for stdin/stdout conversion. + +Binary files sunpinyin-20130710-orig/.git/index and sunpinyin-20130710/.git/index differ +diff -Nurb --strip-trailing-cr sunpinyin-20130710-orig/man/SConscript sunpinyin-20130710/man/SConscript +--- sunpinyin-20130710-orig/man/SConscript 2013-07-09 18:23:12.000000000 +0200 ++++ sunpinyin-20130710/man/SConscript 2015-12-29 20:56:12.712089232 +0100 +@@ -1,7 +1,7 @@ + import os + Import('env') + +-pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET') ++pod2man = Builder(action = 'pod2man $SOURCE $TARGET') + env.Append(BUILDERS = {'Man': pod2man}) + + env.Man('mmseg.1', 'mmseg.pod') diff --git a/sunpinyin.spec b/sunpinyin.spec index 13c0459..fab60fd 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.14%{?dist} +Release: 0.15.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -12,6 +12,7 @@ Source0: %{name}-%{gitdate}.tar.xz Source2: http://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2 Source3: http://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 Patch0: sunpinyin-aarch64.patch +Patch1: sunpinyin-20130710-pod2man-v4.patch BuildRequires: sqlite-devel BuildRequires: gettext BuildRequires: scons @@ -28,7 +29,7 @@ systems. The 2.0 release currently supports iBus, XIM, and Mac OS X. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files that allows user @@ -48,6 +49,7 @@ files needed by the sunpinyin input methods. %prep %setup -q -n %{name}-%{gitdate} %patch0 -p1 +%patch1 -p1 -b .pod2man-v4 mkdir -p raw cp %SOURCE2 raw cp %SOURCE3 raw @@ -57,6 +59,9 @@ tar xvf dict.utf8-20130220.tar.bz2 popd %build +# export CFLAGS, CXXFLAGS, LDFLAGS, ... +%configure || : + scons %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} --datadir=%{_datadir} export PATH=`pwd`/src:$PATH pushd raw @@ -67,37 +72,46 @@ popd %install scons %{?_smp_mflags} --prefix=%{_prefix} --libdir=%{_libdir} --datadir=%{_datadir} install --install-sandbox=%{buildroot} pushd raw -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +make install DESTDIR=%{buildroot} INSTALL="install -p" popd -%clean -rm -rf %{buildroot} +# additional %%doc files to include by path to avoid duplicates/conflicts +# see https://bugzilla.redhat.com/1001266 +install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING *.LICENSE -%doc README TODO +%license COPYING *.LICENSE %{_libdir}/libsunpinyin*.so.* %{_docdir}/%{name}/README +%{_docdir}/%{name}/AUTHORS +%{_docdir}/%{name}/TODO %files devel -%defattr(-,root,root,-) %{_libdir}/libsunpinyin*.so %{_libdir}/pkgconfig/sunpinyin*.pc %{_includedir}/sunpinyin* %files data -%defattr(-,root,root,-) %{_datadir}/%{name} %{_bindir}/* %{_mandir}/man1/*.1.gz %{_docdir}/%{name}/SLM-*.mk %changelog +* Tue Dec 29 2015 Michael Schwendt - 2.0.4-0.15.20130710git +- Rawhide only: Fix pod2man invocation for perl-podlators >= 4. +- Export global compiler flags before building. +- Minor spec cleanup: remove %%defattr usage and %%clean section, + use %%license, add %%_isa to -devel base package dependency, + don't mix %%buildroot and $RPM_BUILD_ROOT +- Insert gitdate into release to follow snapshot guidelines. +- Fix duplicated doc files (#1001266). + * Fri Jun 19 2015 Fedora Release Engineering - 2.0.4-0.14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -128,7 +142,7 @@ rm -rf %{buildroot} * Fri Feb 15 2013 Fedora Release Engineering - 2.0.4-0.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Sun Jul 28 2012 Liang Suilong - 2.0.4-0.5 +* Sat Jul 28 2012 Liang Suilong - 2.0.4-0.5 - Fix the spec file for building fcitx-sunpinyin * Thu Jul 26 2012 Liang Suilong - 2.0.4-0.4 From d19717631cc6f5f6e0d9af6dc6bce385f276e55d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 00:58:18 +0000 Subject: [PATCH 28/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index fab60fd..1549883 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.15.%{gitdate}git%{?dist} +Release: 0.16.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -103,6 +103,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.0.4-0.16.20130710git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Dec 29 2015 Michael Schwendt - 2.0.4-0.15.20130710git - Rawhide only: Fix pod2man invocation for perl-podlators >= 4. - Export global compiler flags before building. From a25381ff38eccd4357f635c99cd9e557bbb4c22f Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 1 Mar 2016 11:08:57 +0800 Subject: [PATCH 29/63] Update to the latest upstream git snapshot --- .gitignore | 3 +++ sources | 6 +++--- sunpinyin.spec | 19 +++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index bca8070..ed145d7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ /lm_sc.t3g.arpa-20121025.tar.bz2 /dict.utf8-20130220.tar.bz2 /sunpinyin-20130710.tar.xz +/dict.utf8-20131214.tar.bz2 +/lm_sc.3gm.arpa-20140820.tar.bz2 +/sunpinyin-20160301.tar.xz diff --git a/sources b/sources index d1efe9d..99210dc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0586241ca33359ad176c842c90bf563e lm_sc.t3g.arpa-20121025.tar.bz2 -1e95894a4a3d8923e86e7b78c77ac815 dict.utf8-20130220.tar.bz2 -f18f8b81d012bbfeb4a647e01af1635c sunpinyin-20130710.tar.xz +2055f50a0f942b49d4417d801388eba5 dict.utf8-20131214.tar.bz2 +20cdc36b3bd7ec28f7e39c2ebb810421 lm_sc.3gm.arpa-20140820.tar.bz2 +4f45c504c7e9ea2af28eb604a4dea033 sunpinyin-20160301.tar.xz diff --git a/sunpinyin.spec b/sunpinyin.spec index 1549883..44e4c6b 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,18 +1,16 @@ %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf -%define gitdate 20130710 +%define gitdate 20160301 Name: sunpinyin Version: 2.0.4 -Release: 0.16.%{gitdate}git%{?dist} +Release: 0.17.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz -Source2: http://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2 -Source3: http://open-gram.googlecode.com/files/dict.utf8-20130220.tar.bz2 -Patch0: sunpinyin-aarch64.patch -Patch1: sunpinyin-20130710-pod2man-v4.patch +Source2: http://downloads.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2 +Source3: http://downloads.sourceforge.net/project/open-gram/dict.utf8-20131214.tar.bz2 BuildRequires: sqlite-devel BuildRequires: gettext BuildRequires: scons @@ -48,14 +46,12 @@ files needed by the sunpinyin input methods. %prep %setup -q -n %{name}-%{gitdate} -%patch0 -p1 -%patch1 -p1 -b .pod2man-v4 mkdir -p raw cp %SOURCE2 raw cp %SOURCE3 raw pushd raw -tar xvf lm_sc.t3g.arpa-20121025.tar.bz2 -tar xvf dict.utf8-20130220.tar.bz2 +tar xvf lm_sc.3gm.arpa-20140820.tar.bz2 +tar xvf dict.utf8-20131214.tar.bz2 popd %build @@ -103,6 +99,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Tue Mar 1 2016 Peng Wu - 2.0.4-0.17.20160301git +- Update to the latest upstream git snapshot + * Fri Feb 05 2016 Fedora Release Engineering - 2.0.4-0.16.20130710git - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5db4a64a20ac28221c0384e7a9376eee5db72b0c Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 1 Mar 2016 11:10:43 +0800 Subject: [PATCH 30/63] remove old patches --- sunpinyin-20130710-pod2man-v4.patch | 15 --------------- sunpinyin-aarch64.patch | 24 ------------------------ sunpinyin-fixes-unistd-compile.patch | 24 ------------------------ 3 files changed, 63 deletions(-) delete mode 100644 sunpinyin-20130710-pod2man-v4.patch delete mode 100644 sunpinyin-aarch64.patch delete mode 100644 sunpinyin-fixes-unistd-compile.patch diff --git a/sunpinyin-20130710-pod2man-v4.patch b/sunpinyin-20130710-pod2man-v4.patch deleted file mode 100644 index df13118..0000000 --- a/sunpinyin-20130710-pod2man-v4.patch +++ /dev/null @@ -1,15 +0,0 @@ -New pod2man would require --name for stdin/stdout conversion. - -Binary files sunpinyin-20130710-orig/.git/index and sunpinyin-20130710/.git/index differ -diff -Nurb --strip-trailing-cr sunpinyin-20130710-orig/man/SConscript sunpinyin-20130710/man/SConscript ---- sunpinyin-20130710-orig/man/SConscript 2013-07-09 18:23:12.000000000 +0200 -+++ sunpinyin-20130710/man/SConscript 2015-12-29 20:56:12.712089232 +0100 -@@ -1,7 +1,7 @@ - import os - Import('env') - --pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET') -+pod2man = Builder(action = 'pod2man $SOURCE $TARGET') - env.Append(BUILDERS = {'Man': pod2man}) - - env.Man('mmseg.1', 'mmseg.pod') diff --git a/sunpinyin-aarch64.patch b/sunpinyin-aarch64.patch deleted file mode 100644 index 0d2eaf8..0000000 --- a/sunpinyin-aarch64.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: sunpinyin-20130710/SConstruct -=================================================================== ---- sunpinyin-20130710.orig/SConstruct -+++ sunpinyin-20130710/SConstruct -@@ -313,7 +313,8 @@ def AppendEndianCheck(conf): - || defined(_POWER) || defined(__powerpc__) \ - || defined(__ppc__) || defined(__hpux) || defined(__hppa) \ - || defined(_MIPSEB) || defined(_POWER) \ -- || defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__)) -+ || defined(__s390__) || (defined(__sh__) && defined(__BIG_ENDIAN__)) \ -+ || defined(__AARCH64EB__) - # define WORDS_BIGENDIAN 1 - - #elif defined(__i386__) || defined(__i386) \ -@@ -324,7 +325,8 @@ def AppendEndianCheck(conf): - || defined(__x86_64) || defined(__x86_64__) \ - || defined(_M_X64) || defined(__bfin__) \ - || defined(__alpha__) || defined(__ARMEL__) \ -- || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) -+ || defined(_MIPSEL) || (defined(__sh__) && defined(__LITTLE_ENDIAN__)) \ -+ || defined(__AARCH64EL__) - # undef WORDS_BIGENDIAN - - #else diff --git a/sunpinyin-fixes-unistd-compile.patch b/sunpinyin-fixes-unistd-compile.patch deleted file mode 100644 index 76ff682..0000000 --- a/sunpinyin-fixes-unistd-compile.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: sunpinyin-2.0.3/src/lexicon/genPYT.cpp -=================================================================== ---- sunpinyin-2.0.3.orig/src/lexicon/genPYT.cpp -+++ sunpinyin-2.0.3/src/lexicon/genPYT.cpp -@@ -37,6 +37,7 @@ - - #include - #include -+#include - - #include "pytrie.h" - #include "pytrie_gen.h" -Index: sunpinyin-2.0.3/src/ime-core/ic_history.cpp -=================================================================== ---- sunpinyin-2.0.3.orig/src/ime-core/ic_history.cpp -+++ sunpinyin-2.0.3/src/ime-core/ic_history.cpp -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - #include "ic_history.h" - From e5080dd753bb6b689b1df9989f231e622cef0b86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 14:13:52 +0000 Subject: [PATCH 31/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 44e4c6b..4dcee8a 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.17.%{gitdate}git%{?dist} +Release: 0.18.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -99,6 +99,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.4-0.18.20160301git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Mar 1 2016 Peng Wu - 2.0.4-0.17.20160301git - Update to the latest upstream git snapshot From 1a61d7f6881b920cb64861cb4f3f5496d212c9a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 19:38:03 +0000 Subject: [PATCH 32/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 4dcee8a..edbe75a 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.18.%{gitdate}git%{?dist} +Release: 0.19.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -99,6 +99,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.4-0.19.20160301git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.0.4-0.18.20160301git - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 262b794b4bccd8e626495f80aea055280301c6ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:58:20 +0000 Subject: [PATCH 33/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index edbe75a..a7c4475 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.19.%{gitdate}git%{?dist} +Release: 0.20.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -99,6 +99,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.4-0.20.20160301git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.0.4-0.19.20160301git - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 805c4b3d70529b8c6cc2a28fac8a19cbdb67fcf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 18:04:29 +0000 Subject: [PATCH 34/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index a7c4475..88cafe8 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -3,7 +3,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.20.%{gitdate}git%{?dist} +Release: 0.21.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -99,6 +99,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.4-0.21.20160301git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.4-0.20.20160301git - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 7d3aa70e7a82f4065445447be250e8dcd14f8f44 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Mar 2018 16:20:06 +0800 Subject: [PATCH 35/63] Add BuildRequires gcc-c++ --- sunpinyin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sunpinyin.spec b/sunpinyin.spec index 88cafe8..89495a3 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -11,6 +11,7 @@ URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz Source2: http://downloads.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2 Source3: http://downloads.sourceforge.net/project/open-gram/dict.utf8-20131214.tar.bz2 +BuildRequires: gcc-c++ BuildRequires: sqlite-devel BuildRequires: gettext BuildRequires: scons From d5cc25475fe4f36c312c285257615583b3869720 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Mar 2018 18:01:21 +0800 Subject: [PATCH 36/63] disable debug package --- sunpinyin.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sunpinyin.spec b/sunpinyin.spec index 89495a3..f6cefa5 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -1,3 +1,6 @@ +# TODO: fixes scons to generate debug information +%global debug_package %{nil} + %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf %define gitdate 20160301 From 32c8ab6840890bfd3405cd80425fbff9e0c5cbe5 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Sun, 18 Mar 2018 21:42:27 +0100 Subject: [PATCH 37/63] Update Python 2 dependency declarations to new packaging standards --- sunpinyin.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index f6cefa5..94a07de 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.21.%{gitdate}git%{?dist} +Release: 0.22.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -17,9 +17,9 @@ Source3: http://downloads.sourceforge.net/project/open-gram/dict.utf8-20131214.t BuildRequires: gcc-c++ BuildRequires: sqlite-devel BuildRequires: gettext -BuildRequires: scons +BuildRequires: python2-scons BuildRequires: perl(Pod::Man) -BuildRequires: python-devel +BuildRequires: python2-devel %description Sunpinyin is an input method engine for Simplified Chinese. It is an SLM based @@ -103,6 +103,10 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sun Mar 18 2018 Iryna Shcherbina - 2.0.4-0.22.20160301git +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Feb 09 2018 Fedora Release Engineering - 2.0.4-0.21.20160301git - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0dfd99ecb1b4e1819017eacf8ceff6e8fdc646cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:59:42 +0000 Subject: [PATCH 38/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 94a07de..51b3c02 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.22.%{gitdate}git%{?dist} +Release: 0.23.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -103,6 +103,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.4-0.23.20160301git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Mar 18 2018 Iryna Shcherbina - 2.0.4-0.22.20160301git - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 07f7d3ad5cf2c7a2437e19507aa00f31561c97aa Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 26 Jul 2018 15:26:38 +0800 Subject: [PATCH 39/63] Use python2 --- sunpinyin-use-python2.patch | 45 +++++++++++++++++++++++++++++++++++++ sunpinyin.spec | 8 ++++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 sunpinyin-use-python2.patch diff --git a/sunpinyin-use-python2.patch b/sunpinyin-use-python2.patch new file mode 100644 index 0000000..0a5219e --- /dev/null +++ b/sunpinyin-use-python2.patch @@ -0,0 +1,45 @@ +commit d0693ba9f2686ffa46328da129ffef345258fa12 +Author: Peng Wu +Date: Thu Jul 26 15:08:41 2018 +0800 + + Use python2 + +diff --git a/SConstruct b/SConstruct +index 01b5cca..1c4d641 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -299,11 +299,11 @@ def CheckPKG(context, name): + + def CheckPython(context): + context.Message('Checking for Python library...') +- ret = context.TryAction('python-config --prefix')[0] ++ ret = context.TryAction('python2-config --prefix')[0] + context.Result(ret) + if ret: +- context.env.MergeFlags(['!python-config --includes', +- '!python-config --libs']) ++ context.env.MergeFlags(['!python2-config --includes', ++ '!python2-config --libs']) + return ret + + +diff --git a/python/pinyin_info_gen.py b/python/pinyin_info_gen.py +index ffb5874..3285876 100755 +--- a/python/pinyin_info_gen.py ++++ b/python/pinyin_info_gen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # +diff --git a/python/quanpin_trie_gen.py b/python/quanpin_trie_gen.py +index 5d516a1..c6ab59e 100755 +--- a/python/quanpin_trie_gen.py ++++ b/python/quanpin_trie_gen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # diff --git a/sunpinyin.spec b/sunpinyin.spec index 51b3c02..f7310c6 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.23.%{gitdate}git%{?dist} +Release: 0.24.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine Group: System Environment/Libraries License: LGPLv2 or CDDL @@ -14,6 +14,7 @@ URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz Source2: http://downloads.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2 Source3: http://downloads.sourceforge.net/project/open-gram/dict.utf8-20131214.tar.bz2 +Patch0: sunpinyin-use-python2.patch BuildRequires: gcc-c++ BuildRequires: sqlite-devel BuildRequires: gettext @@ -50,6 +51,8 @@ files needed by the sunpinyin input methods. %prep %setup -q -n %{name}-%{gitdate} +%patch0 -p1 -b .python2 + mkdir -p raw cp %SOURCE2 raw cp %SOURCE3 raw @@ -103,6 +106,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Thu Jul 26 2018 Peng Wu - 2.0.4-0.24.20160301git%{?dist} +- Use python2 + * Sat Jul 14 2018 Fedora Release Engineering - 2.0.4-0.23.20160301git - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d0c8a327b2156651c03290cca77bcc0e130b4ae0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:05 +0100 Subject: [PATCH 40/63] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- sunpinyin.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index f7310c6..1b1f646 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -83,9 +83,7 @@ popd install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license COPYING *.LICENSE From 50ebb916d977867c9475e1e7a1a3a7840525c1f4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:27 +0100 Subject: [PATCH 41/63] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- sunpinyin.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 1b1f646..1302ae3 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -8,7 +8,6 @@ Name: sunpinyin Version: 2.0.4 Release: 0.24.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine -Group: System Environment/Libraries License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz @@ -31,7 +30,6 @@ systems. The 2.0 release currently supports iBus, XIM, and Mac OS X. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -40,7 +38,6 @@ to write their own front-end for sunpinyin. %package data Summary: Little-endian data files for %{name} -Group: System Environment/Libraries License: CC-BY-SA Obsoletes: %{name}-data-le Obsoletes: %{name}-data-be From 7c7abaf4f631bfd0e53f4779ec555feec3da4bae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 08:58:59 +0000 Subject: [PATCH 42/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 1302ae3..b04f71f 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.24.%{gitdate}git%{?dist} +Release: 0.25.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -101,6 +101,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.4-0.25.20160301git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 26 2018 Peng Wu - 2.0.4-0.24.20160301git%{?dist} - Use python2 From 6d7ff2660467c94da0cf8fd6f7e36b2b09e23052 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 00:34:37 +0000 Subject: [PATCH 43/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index b04f71f..560d636 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 2.0.4 -Release: 0.25.%{gitdate}git%{?dist} +Release: 0.26.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -101,6 +101,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.4-0.26.20160301git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.0.4-0.25.20160301git - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a5c0016cfcc60186c95cc20258e76293c2f58005 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Aug 2019 14:36:49 +0800 Subject: [PATCH 44/63] Update scons and use python3 --- .gitignore | 1 + sources | 6 +- sunpinyin-fixes-scons.patch | 34 +++++++ sunpinyin-use-python2.patch | 45 ---------- sunpinyin-use-python3.patch | 171 ++++++++++++++++++++++++++++++++++++ sunpinyin.spec | 19 ++-- 6 files changed, 220 insertions(+), 56 deletions(-) create mode 100644 sunpinyin-fixes-scons.patch delete mode 100644 sunpinyin-use-python2.patch create mode 100644 sunpinyin-use-python3.patch diff --git a/.gitignore b/.gitignore index ed145d7..d1e5ba5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /dict.utf8-20131214.tar.bz2 /lm_sc.3gm.arpa-20140820.tar.bz2 /sunpinyin-20160301.tar.xz +/sunpinyin-20190805.tar.xz diff --git a/sources b/sources index 99210dc..bbf146a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2055f50a0f942b49d4417d801388eba5 dict.utf8-20131214.tar.bz2 -20cdc36b3bd7ec28f7e39c2ebb810421 lm_sc.3gm.arpa-20140820.tar.bz2 -4f45c504c7e9ea2af28eb604a4dea033 sunpinyin-20160301.tar.xz +SHA512 (sunpinyin-20190805.tar.xz) = 96105d35d6ba6dee48b46a9ea390809e80cb167983772606099f7bbb37a9cbc7aec1de503c655ab00f8618aebfc7cc8d71e915598de97c98e425eb42c73c60b5 +SHA512 (dict.utf8-20131214.tar.bz2) = adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b +SHA512 (lm_sc.3gm.arpa-20140820.tar.bz2) = ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519 diff --git a/sunpinyin-fixes-scons.patch b/sunpinyin-fixes-scons.patch new file mode 100644 index 0000000..411ec3c --- /dev/null +++ b/sunpinyin-fixes-scons.patch @@ -0,0 +1,34 @@ +Index: sunpinyin-20190805/SConstruct +=================================================================== +--- sunpinyin-20190805.orig/SConstruct ++++ sunpinyin-20190805/SConstruct +@@ -2,6 +2,7 @@ import platform + import os + import sys + ++from functools import reduce + + version = "2.0.4" + abi_major = 3 +@@ -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() +Index: sunpinyin-20190805/src/SConscript +=================================================================== +--- sunpinyin-20190805.orig/src/SConscript ++++ sunpinyin-20190805/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", "0755"), + ]) + + # -*- indent-tabs-mode: nil -*- vim:et:ts=4 diff --git a/sunpinyin-use-python2.patch b/sunpinyin-use-python2.patch deleted file mode 100644 index 0a5219e..0000000 --- a/sunpinyin-use-python2.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit d0693ba9f2686ffa46328da129ffef345258fa12 -Author: Peng Wu -Date: Thu Jul 26 15:08:41 2018 +0800 - - Use python2 - -diff --git a/SConstruct b/SConstruct -index 01b5cca..1c4d641 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -299,11 +299,11 @@ def CheckPKG(context, name): - - def CheckPython(context): - context.Message('Checking for Python library...') -- ret = context.TryAction('python-config --prefix')[0] -+ ret = context.TryAction('python2-config --prefix')[0] - context.Result(ret) - if ret: -- context.env.MergeFlags(['!python-config --includes', -- '!python-config --libs']) -+ context.env.MergeFlags(['!python2-config --includes', -+ '!python2-config --libs']) - return ret - - -diff --git a/python/pinyin_info_gen.py b/python/pinyin_info_gen.py -index ffb5874..3285876 100755 ---- a/python/pinyin_info_gen.py -+++ b/python/pinyin_info_gen.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - # -diff --git a/python/quanpin_trie_gen.py b/python/quanpin_trie_gen.py -index 5d516a1..c6ab59e 100755 ---- a/python/quanpin_trie_gen.py -+++ b/python/quanpin_trie_gen.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - # diff --git a/sunpinyin-use-python3.patch b/sunpinyin-use-python3.patch new file mode 100644 index 0000000..aaf55a4 --- /dev/null +++ b/sunpinyin-use-python3.patch @@ -0,0 +1,171 @@ +commit d0693ba9f2686ffa46328da129ffef345258fa12 +Author: Peng Wu +Date: Thu Jul 26 15:08:41 2018 +0800 + + Use python3 + +Index: sunpinyin-20190805/SConstruct +=================================================================== +--- sunpinyin-20190805.orig/SConstruct ++++ sunpinyin-20190805/SConstruct +@@ -299,11 +299,11 @@ def CheckPKG(context, name): + + def CheckPython(context): + context.Message('Checking for Python library...') +- ret = context.TryAction('python-config --prefix')[0] ++ ret = context.TryAction('python3-config --prefix')[0] + context.Result(ret) + if ret: +- context.env.MergeFlags(['!python-config --includes', +- '!python-config --libs']) ++ context.env.MergeFlags(['!python3-config --includes', ++ '!python3-config --libs']) + return ret + + +Index: sunpinyin-20190805/python/pinyin_info_gen.py +=================================================================== +--- sunpinyin-20190805.orig/python/pinyin_info_gen.py ++++ sunpinyin-20190805/python/pinyin_info_gen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # +@@ -38,60 +38,60 @@ + from pinyin_data import * + + def fmt_str_array (name, var) : +- print 'static const char *%s[] = { %s };' % (name, ', '.join ('"%s"' % s for s in var)) ++ print('static const char *%s[] = { %s };' % (name, ', '.join ('"%s"' % s for s in var))) + + def fmt_array_size (name): +- print 'static const unsigned num_%s = sizeof(%s) / sizeof(*%s);' % (name, name, name) ++ print('static const unsigned num_%s = sizeof(%s) / sizeof(*%s);' % (name, name, name)) + + def fmt_str_pair_array (name, var) : +- print 'static const char *%s[] = {' % name ++ print('static const char *%s[] = {' % name) + for s1, s2 in var: +- print ' %-7s %s' % ('"%s",' % s1, '"%s",' % s2) +- print '};' ++ print(' %-7s %s' % ('"%s",' % s1, '"%s",' % s2)) ++ print('};') + + def fmt_pair_array_size (name): +- print 'static const unsigned num_%s = sizeof(%s) / sizeof(*%s) / 2;' % (name, name, name) ++ print('static const unsigned num_%s = sizeof(%s) / sizeof(*%s) / 2;' % (name, name, name)) + + fmt_str_array ('initials', initials) + fmt_array_size ('initials') +-print '' ++print('') + + fmt_str_array('finals', finals) + fmt_array_size ('finals') +-print '' ++print('') + + fmt_str_array('fuzzy_finals', inner_fuzzy_finals) + fmt_array_size ('fuzzy_finals') +-print '' ++print('') + + fmt_str_pair_array ('fuzzy_pairs', fuzzy_pairs) + fmt_pair_array_size ('fuzzy_pairs') +-print '' ++print('') + + fmt_str_pair_array ('auto_correction_pairs', sorted(auto_correction_pairs.items())) + fmt_pair_array_size ('auto_correction_pairs') +-print '' ++print('') + +-print 'static const unsigned fuzzy_finals_map [] = {' ++print('static const unsigned fuzzy_finals_map [] = {') + for s in inner_fuzzy_finals: +- print ' %-7s %-7s %-7s /* %-4s -> %-4s len %d */' % ('0x%02x,' % finals.index(s), '0x%02x,' % valid_syllables[s[1:]], '%d,' % (len(s)-1,), s, s[1:], len(s)-1) +-print '};\n' ++ print(' %-7s %-7s %-7s /* %-4s -> %-4s len %d */' % ('0x%02x,' % finals.index(s), '0x%02x,' % valid_syllables[s[1:]], '%d,' % (len(s)-1,), s, s[1:], len(s)-1)) ++print('};\n') + +-print 'static const TPyTabEntry pinyin_table[] = {' ++print('static const TPyTabEntry pinyin_table[] = {') + for syllable, hex_syllable in sorted(valid_syllables.items()): +- print ' { %-9s %s },' % ('"%s",' % syllable, '0x%05x' % hex_syllable) +-print '};\n' ++ print(' { %-9s %s },' % ('"%s",' % syllable, '0x%05x' % hex_syllable)) ++print('};\n') + +-print 'static const unsigned fuzzy_pre_syllables [] = {' ++print('static const unsigned fuzzy_pre_syllables [] = {') + for s in fuzzy_pre_syllables: +- print ' %-11s %-7s %-11s /* %s */' % ('0x%05x,' % valid_syllables[s[:-1]], "'%s'," % s[-1], '0x%05x,' % valid_syllables[s], s) +-print ' 0x0,' +-print '};\n' ++ print(' %-11s %-7s %-11s /* %s */' % ('0x%05x,' % valid_syllables[s[:-1]], "'%s'," % s[-1], '0x%05x,' % valid_syllables[s], s)) ++print(' 0x0,') ++print('};\n') + +-print 'static const unsigned fuzzy_pro_syllables [] = {' ++print('static const unsigned fuzzy_pro_syllables [] = {') + for s in fuzzy_pro_syllables: +- print ' %-11s %-7s %-11s /* %s */' % ('0x%05x,' % valid_syllables[s], "'%s'," % s[0], '0x%05x,' % valid_syllables[s[1:]], s) +-print ' 0x0,' +-print '};\n' ++ print(' %-11s %-7s %-11s /* %s */' % ('0x%05x,' % valid_syllables[s], "'%s'," % s[0], '0x%05x,' % valid_syllables[s[1:]], s)) ++print(' 0x0,') ++print('};\n') + + # -*- indent-tabs-mode: nil -*- vim:et:ts=4 +Index: sunpinyin-20190805/python/quanpin_trie_gen.py +=================================================================== +--- sunpinyin-20190805.orig/python/quanpin_trie_gen.py ++++ sunpinyin-20190805/python/quanpin_trie_gen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + # +@@ -42,7 +42,7 @@ import sys + orig_trie = trie.Trie () + pytrie = trie.DATrie () + +-for syllable, hex_syllable in pinyin_data.valid_syllables.items(): ++for syllable, hex_syllable in list(pinyin_data.valid_syllables.items()): + orig_trie.add(syllable[::-1], hex_syllable) + + pytrie.construct_from_trie (orig_trie) +Index: sunpinyin-20190805/python/trie.py +=================================================================== +--- sunpinyin-20190805.orig/python/trie.py ++++ sunpinyin-20190805/python/trie.py +@@ -133,7 +133,7 @@ class DATrie (object): + + trie = Trie() + for w in words: +- trie.add (w, itval.next() if itval else -1) ++ trie.add (w, next(itval) if itval else -1) + + self.construct_from_trie (trie, values!=None) + +@@ -161,7 +161,7 @@ class DATrie (object): + if progress_cb: + progress_cb () + +- for i in xrange (self.chr_encoder (max(trie.root.trans))+1): ++ for i in range (self.chr_encoder (max(trie.root.trans))+1): + if self.check[i] == -1: + self.check[i] = 0 + +@@ -272,7 +272,7 @@ def test (): + v, l = match_longest (datrie, s+'b') + assert (len(s) == l and valid_syllables[s] == v) + +- print 'test executed successfully' ++ print('test executed successfully') + + if __name__ == "__main__": + test () diff --git a/sunpinyin.spec b/sunpinyin.spec index 560d636..a61e517 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -2,24 +2,25 @@ %global debug_package %{nil} %define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/xsunpinyin.conf -%define gitdate 20160301 +%define gitdate 20190805 Name: sunpinyin -Version: 2.0.4 -Release: 0.26.%{gitdate}git%{?dist} +Version: 3.0.0 +Release: 0.1.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz Source2: http://downloads.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2 Source3: http://downloads.sourceforge.net/project/open-gram/dict.utf8-20131214.tar.bz2 -Patch0: sunpinyin-use-python2.patch +Patch0: sunpinyin-use-python3.patch +Patch1: sunpinyin-fixes-scons.patch BuildRequires: gcc-c++ BuildRequires: sqlite-devel BuildRequires: gettext -BuildRequires: python2-scons +BuildRequires: python3-scons BuildRequires: perl(Pod::Man) -BuildRequires: python2-devel +BuildRequires: python3-devel %description Sunpinyin is an input method engine for Simplified Chinese. It is an SLM based @@ -47,8 +48,7 @@ The %{name}-data package contains necessary lexicon data and its index data files needed by the sunpinyin input methods. %prep -%setup -q -n %{name}-%{gitdate} -%patch0 -p1 -b .python2 +%autosetup -n %{name}-%{gitdate} -S quilt mkdir -p raw cp %SOURCE2 raw @@ -101,6 +101,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Mon Aug 5 2019 Peng Wu - 3.0.0-0.1.20190805git +- Update scons and use python3 + * Sat Jul 27 2019 Fedora Release Engineering - 2.0.4-0.26.20160301git - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6956e3bdb3d77b43f90f4f4b05abd8dbde3b0d25 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Aug 2019 15:15:13 +0800 Subject: [PATCH 45/63] fixes typo --- sunpinyin.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index a61e517..718ac51 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -48,7 +48,9 @@ The %{name}-data package contains necessary lexicon data and its index data files needed by the sunpinyin input methods. %prep -%autosetup -n %{name}-%{gitdate} -S quilt +%setup -q -n %{name}-%{gitdate} +%patch0 -p1 -b .python3 +%patch1 -p1 -b .scons mkdir -p raw cp %SOURCE2 raw From db3443f12b24cca1b8a2f39299496d983c4d1a5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 00:41:47 +0000 Subject: [PATCH 46/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 718ac51..e845e3b 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.1.%{gitdate}git%{?dist} +Release: 0.2.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -103,6 +103,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.0.0-0.2.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Aug 5 2019 Peng Wu - 3.0.0-0.1.20190805git - Update scons and use python3 From 32f0f3c0f21831c948abe6c44bdae5e67bf6b87a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 11:46:41 +0000 Subject: [PATCH 47/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index e845e3b..000be4a 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.2.%{gitdate}git%{?dist} +Release: 0.3.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -103,6 +103,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.0-0.3.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 3.0.0-0.2.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From deccb8ed46366845b04bd3ad260257830c39709f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:22:54 +0000 Subject: [PATCH 48/63] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 000be4a..dd8fa21 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.3.%{gitdate}git%{?dist} +Release: 0.4.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -103,6 +103,10 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.0.0-0.4.20190805git +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.0.0-0.3.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 50405e2bb5b2f8b2cfcbdc75cddbdc8225269485 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 22:05:06 +0000 Subject: [PATCH 49/63] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- sunpinyin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sunpinyin.spec b/sunpinyin.spec index dd8fa21..e7c9c90 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -15,6 +15,7 @@ Source2: http://downloads.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140 Source3: http://downloads.sourceforge.net/project/open-gram/dict.utf8-20131214.tar.bz2 Patch0: sunpinyin-use-python3.patch Patch1: sunpinyin-fixes-scons.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: sqlite-devel BuildRequires: gettext From 7e7460b41a0056587608ee4b2b802b816c85e359 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:18:59 +0000 Subject: [PATCH 50/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index e7c9c90..10e6496 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.4.%{gitdate}git%{?dist} +Release: 0.5.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -104,6 +104,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.0-0.5.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 3.0.0-0.4.20190805git - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7817fe2fcf9d50a349d7d0369593300d128b634a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:33:49 +0000 Subject: [PATCH 51/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 10e6496..097a9d7 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.5.%{gitdate}git%{?dist} +Release: 0.6.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -104,6 +104,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.0.0-0.6.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.0.0-0.5.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 05cc83269bcaf70c683ffe3b3ad2ea56499bd53d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:57:10 +0000 Subject: [PATCH 52/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 097a9d7..4113f1f 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.6.%{gitdate}git%{?dist} +Release: 0.7.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -104,6 +104,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.0.0-0.7.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.0.0-0.6.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a72b05caea8d45281d493a24878a1aca04835647 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:43:55 +0000 Subject: [PATCH 53/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 4113f1f..2349064 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.7.%{gitdate}git%{?dist} +Release: 0.8.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -104,6 +104,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.0.0-0.8.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 3.0.0-0.7.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 1aa8c3fe3042b4a6937c0159c3dc2df22a15c025 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:20:13 +0000 Subject: [PATCH 54/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 2349064..26deda7 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.8.%{gitdate}git%{?dist} +Release: 0.9.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPLv2 or CDDL URL: http://code.google.com/p/sunpinyin/ @@ -104,6 +104,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.0.0-0.9.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 3.0.0-0.8.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2cf93386619430bf454ee8229e0a40764447e8dc Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 28 Apr 2023 14:13:59 +0800 Subject: [PATCH 55/63] Migrate to SPDX license --- sunpinyin.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 26deda7..029af65 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,9 +6,9 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.9.%{gitdate}git%{?dist} +Release: 0.10.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine -License: LGPLv2 or CDDL +License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ Source0: %{name}-%{gitdate}.tar.xz Source2: http://downloads.sourceforge.net/project/open-gram/lm_sc.3gm.arpa-20140820.tar.bz2 @@ -49,9 +49,7 @@ The %{name}-data package contains necessary lexicon data and its index data files needed by the sunpinyin input methods. %prep -%setup -q -n %{name}-%{gitdate} -%patch0 -p1 -b .python3 -%patch1 -p1 -b .scons +%autosetup -p1 -n %{name}-%{gitdate} mkdir -p raw cp %SOURCE2 raw @@ -83,8 +81,6 @@ popd install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} -%ldconfig_scriptlets - %files %license COPYING *.LICENSE %{_libdir}/libsunpinyin*.so.* @@ -104,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Apr 28 2023 Peng Wu - 3.0.0-0.10.20190805git +- Migrate to SPDX license + * Sat Jan 21 2023 Fedora Release Engineering - 3.0.0-0.9.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 99f030cc79d635fb2e40bd4598792a003f02f1cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:50:25 +0000 Subject: [PATCH 56/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 029af65..248822b 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.10.%{gitdate}git%{?dist} +Release: 0.11.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ @@ -100,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.0.0-0.11.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Apr 28 2023 Peng Wu - 3.0.0-0.10.20190805git - Migrate to SPDX license From 403f415e1269233881aa4a741a141268f6bc8956 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:44:16 +0000 Subject: [PATCH 57/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 248822b..c4477f4 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.11.%{gitdate}git%{?dist} +Release: 0.12.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ @@ -100,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.0.0-0.12.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.0.0-0.11.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7ef6c6baa590c2ae52000d4fb2e38143812fb042 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:43:32 +0000 Subject: [PATCH 58/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index c4477f4..b662b71 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.12.%{gitdate}git%{?dist} +Release: 0.13.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ @@ -100,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.0.0-0.13.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 3.0.0-0.12.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 47212ef6e81b244683fb88e61196f973d057318f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:58:05 +0000 Subject: [PATCH 59/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index b662b71..92144ef 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.13.%{gitdate}git%{?dist} +Release: 0.14.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ @@ -100,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.0.0-0.14.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 3.0.0-0.13.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 899088a632fff02c0067905f73b9042c9e4ffd06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 17 Jan 2025 22:35:47 +0000 Subject: [PATCH 60/63] Migrate subpackage to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sunpinyin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 92144ef..112c8f1 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -40,7 +40,7 @@ to write their own front-end for sunpinyin. %package data Summary: Little-endian data files for %{name} -License: CC-BY-SA +License: CC-BY-SA-3.0 Obsoletes: %{name}-data-le Obsoletes: %{name}-data-be From 9460dd8aa1d8c8827c66c1e3b80250f20996b4ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:53:51 +0000 Subject: [PATCH 61/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 112c8f1..73580bd 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.14.%{gitdate}git%{?dist} +Release: 0.15.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ @@ -100,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0.0-0.15.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 3.0.0-0.14.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1724e1ca0fc1bde4482953b1b7ebbd91091875e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 18:40:28 +0000 Subject: [PATCH 62/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index 73580bd..e0a1a8c 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.15.%{gitdate}git%{?dist} +Release: 0.16.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ @@ -100,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.0.0-0.16.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 3.0.0-0.15.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 677c59968f2e6d8e81d277f6729933a89f83f988 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 07:10:51 +0000 Subject: [PATCH 63/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- sunpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunpinyin.spec b/sunpinyin.spec index e0a1a8c..261e0e3 100644 --- a/sunpinyin.spec +++ b/sunpinyin.spec @@ -6,7 +6,7 @@ Name: sunpinyin Version: 3.0.0 -Release: 0.16.%{gitdate}git%{?dist} +Release: 0.17.%{gitdate}git%{?dist} Summary: A statistical language model based Chinese input method engine License: LGPL-2.1-only OR CDDL-1.0 URL: http://code.google.com/p/sunpinyin/ @@ -100,6 +100,9 @@ install -m0644 AUTHORS TODO %{buildroot}%{_docdir}/%{name} %{_docdir}/%{name}/SLM-*.mk %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.0.0-0.17.20190805git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 3.0.0-0.16.20190805git - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild