From e5080dd753bb6b689b1df9989f231e622cef0b86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 14:13:52 +0000 Subject: [PATCH 01/33] - 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 02/33] - 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 03/33] - 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 04/33] - 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 05/33] 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 06/33] 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 07/33] 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 08/33] - 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 09/33] 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 10/33] 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 11/33] 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 12/33] - 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 13/33] - 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 14/33] 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 15/33] 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 16/33] - 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 17/33] - 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 18/33] - 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 19/33] 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 20/33] - 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 21/33] - 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 22/33] - 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 23/33] 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 24/33] 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 25/33] 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 26/33] 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 27/33] 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 28/33] 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 29/33] 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 30/33] 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 31/33] 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 32/33] 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 33/33] 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