From 42315b9f920a0572dd903ceeea3ec9240aed85de Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 19 May 2023 14:38:49 +0800 Subject: [PATCH 01/22] Migrate to SPDX license --- libpinyin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libpinyin.spec b/libpinyin.spec index 2ceaf87..c996430 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,10 +2,10 @@ Name: libpinyin Version: 2.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to deal with pinyin -License: GPLv3+ +License: GPL-3.0-or-later URL: https://github.com/libpinyin/libpinyin Source0: http://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz %if %snapshot @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Fri May 19 2023 Peng Wu - 2.8.1-3 +- Migrate to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 2.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8532ea0ead6cb0b37b682e36ac908fa10ef7e5b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 11:46:47 +0000 Subject: [PATCH 02/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index c996430..d8f8eba 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri May 19 2023 Peng Wu - 2.8.1-3 - Migrate to SPDX license From 523cfe1a380c24e3fe94042116ac0c8c12213f1f Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 23 Aug 2023 13:52:44 +0800 Subject: [PATCH 03/22] Switch to use Kyoto Cabinet --- libpinyin.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libpinyin.spec b/libpinyin.spec index d8f8eba..b652d73 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -13,8 +13,8 @@ Patch0: libpinyin-2.8.x-head.patch %endif BuildRequires: gcc-c++ -BuildRequires: libdb-devel, glib2-devel -BuildRequires: make +BuildRequires: kyotocabinet-devel, glib2-devel +BuildRequires: make Requires: %{name}-data%{?_isa} = %{version}-%{release} %description @@ -65,7 +65,7 @@ The libzhuyin package contains libzhuyin compatibility library. %build %configure --disable-static \ - --with-dbm=BerkeleyDB \ + --with-dbm=KyotoCabinet \ --enable-libzhuyin %make_build @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Wed Aug 23 2023 Peng Wu - 2.8.1-5 +- Switch to use Kyoto Cabinet + * Thu Jul 20 2023 Fedora Release Engineering - 2.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 689c6213299fb4151b9a3bce9ee297d6b2d3c045 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:00:57 +0000 Subject: [PATCH 04/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index b652d73..1098303 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.8.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.8.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Aug 23 2023 Peng Wu - 2.8.1-5 - Switch to use Kyoto Cabinet From 9187d951b80355c302260835c6b49d36afba8b8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 03:13:48 +0000 Subject: [PATCH 05/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index 1098303..d50c9cf 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.8.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 2.8.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.8.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 99e3228d2102840a3a8ef835c1b538185ce326e6 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 06/22] Eliminate use of obsolete %patchN syntax (#2283636) --- libpinyin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index d50c9cf..f703df5 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -60,7 +60,7 @@ The libzhuyin package contains libzhuyin compatibility library. %setup -q %if %snapshot -%patch0 -p1 -b .head +%patch -P0 -p1 -b .head %endif %build From 4683dee947d8ddabf6b5080864df5d2adb4962ac Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 31 May 2024 12:38:05 +0800 Subject: [PATCH 07/22] Rewrite CI tests --- .fmf/version | 1 + plans/basic.fmf | 6 ++++++ tests/main.fmf | 13 +++++++++++++ tests/make_check.sh | 11 ++++++++++- tests/tests.yml | 22 ---------------------- 5 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..d57536e --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,6 @@ +summary: Basic smoke test +discover: + how: fmf + dist-git-source: true +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..3e1e10f --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,13 @@ +test: bash ./make_check.sh .. +duration: 50m +framework: shell +require: + - make + - gcc-c++ + - autoconf + - automake + - libtool + - gettext-devel + - glib2-devel + - kyotocabinet-devel + - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh index 3bd1ab7..796af33 100644 --- a/tests/make_check.sh +++ b/tests/make_check.sh @@ -9,7 +9,16 @@ check_return_value () { } cd $1 -./configure --prefix=/usr --with-dbm=BerkeleyDB --enable-libzhuyin + +VERSION=`rpmspec -q --srpm --qf "%{version}" libpinyin.spec 2>/dev/null` + +if test -d libpinyin-$VERSION-build; +then cd libpinyin-$VERSION-build; +fi + +cd libpinyin-$VERSION + +./configure --prefix=/usr --with-dbm=KyotoCabinet --enable-libzhuyin check_return_value $? make check_return_value $? diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 78c5241..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,22 +0,0 @@ -- hosts: localhost - vars: - - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" - tags: - - classic - remote_user: root - roles: - - role: standard-test-source # to get the source tar ball to do “make check” - - role: standard-test-basic - required_packages: - - make - - gcc-c++ - - autoconf - - automake - - libtool - - gettext-devel - - glib2-devel - - libdb-devel - tests: - - make-check: - dir: ./ - run: bash ./make_check.sh ./source From 66df7710ceb1632c15db51872c190166d4e53667 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 14:47:06 +0000 Subject: [PATCH 08/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index f703df5..45fda21 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.8.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.8.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 2.8.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 609d71701b5b96782ae233bf8101daf63d2d0388 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 13 Aug 2024 16:44:05 +0800 Subject: [PATCH 09/22] Update to 2.9.91 --- .gitignore | 1 + libpinyin.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eeb64c0..1f5c4c5 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /libpinyin-2.7.92.tar.gz /libpinyin-2.8.0.tar.gz /libpinyin-2.8.1.tar.gz +/libpinyin-2.9.91.tar.gz diff --git a/libpinyin.spec b/libpinyin.spec index 45fda21..8652511 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,8 +1,8 @@ %global snapshot 0 Name: libpinyin -Version: 2.8.1 -Release: 8%{?dist} +Version: 2.9.91 +Release: 1%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Tue Aug 13 2024 Peng Wu - 2.9.91-1 +- Update to 2.9.91 +- auto clean user data when data corruption +- support to export bigram phrase + * Thu Jul 18 2024 Fedora Release Engineering - 2.8.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index c93434d..feacbef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.8.1.tar.gz) = cf344d12ba31b72fd63e39345a294f8507533db7b2cea3df69214fee7f62068823832587907e78df44aeb035990e9dbc5fd4eb5ee95a757158fc165abb986b91 +SHA512 (libpinyin-2.9.91.tar.gz) = bff5214fa9d0dd501d7a3b6421456928af17055ba2b1749ad1d6760010dd3bec94d9a2a10a05212093e248b9667a368d762ec310fd51a8eb31b4f823af736597 From 4ae5479b90da48716f7bd6aeee8ad7f5f369ce17 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 21 Oct 2024 12:44:28 +0800 Subject: [PATCH 10/22] Update to 2.9.92 --- .gitignore | 1 + libpinyin.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1f5c4c5..7d7be1e 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /libpinyin-2.8.0.tar.gz /libpinyin-2.8.1.tar.gz /libpinyin-2.9.91.tar.gz +/libpinyin-2.9.92.tar.gz diff --git a/libpinyin.spec b/libpinyin.spec index 8652511..5c38b34 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,7 +1,7 @@ %global snapshot 0 Name: libpinyin -Version: 2.9.91 +Version: 2.9.92 Release: 1%{?dist} Summary: Library to deal with pinyin @@ -108,6 +108,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Mon Oct 21 2024 Peng Wu - 2.9.92-1 +- Update to 2.9.92 +- support punctuation candidate + * Tue Aug 13 2024 Peng Wu - 2.9.91-1 - Update to 2.9.91 - auto clean user data when data corruption diff --git a/sources b/sources index feacbef..cf18322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.9.91.tar.gz) = bff5214fa9d0dd501d7a3b6421456928af17055ba2b1749ad1d6760010dd3bec94d9a2a10a05212093e248b9667a368d762ec310fd51a8eb31b4f823af736597 +SHA512 (libpinyin-2.9.92.tar.gz) = 0ce0c950bb77511c73a5f4e587aa72dce7a5541a748d4e5cc6e9df1660146ef03d259da8c9fee42768a468f91facff489bf604ebdeafe01c5719b13e68a8b7fb From 4ecffc72a176b9cc5d65473df02ebb1bf22c15c3 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 17 Dec 2024 12:06:20 +0800 Subject: [PATCH 11/22] Update to 2.9.93 --- .gitignore | 1 + libpinyin-2.8.x-head.patch => libpinyin-2.10.x-head.patch | 0 libpinyin.spec | 8 ++++++-- sources | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) rename libpinyin-2.8.x-head.patch => libpinyin-2.10.x-head.patch (100%) diff --git a/.gitignore b/.gitignore index 7d7be1e..b44fdda 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /libpinyin-2.8.1.tar.gz /libpinyin-2.9.91.tar.gz /libpinyin-2.9.92.tar.gz +/libpinyin-2.9.93.tar.gz diff --git a/libpinyin-2.8.x-head.patch b/libpinyin-2.10.x-head.patch similarity index 100% rename from libpinyin-2.8.x-head.patch rename to libpinyin-2.10.x-head.patch diff --git a/libpinyin.spec b/libpinyin.spec index 5c38b34..56ec0b7 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,7 +1,7 @@ %global snapshot 0 Name: libpinyin -Version: 2.9.92 +Version: 2.9.93 Release: 1%{?dist} Summary: Library to deal with pinyin @@ -9,7 +9,7 @@ License: GPL-3.0-or-later URL: https://github.com/libpinyin/libpinyin Source0: http://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz %if %snapshot -Patch0: libpinyin-2.8.x-head.patch +Patch0: libpinyin-2.10.x-head.patch %endif BuildRequires: gcc-c++ @@ -108,6 +108,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Tue Dec 17 2024 Peng Wu - 2.9.93-1 +- Update to 2.9.93 +- bug fixes + * Mon Oct 21 2024 Peng Wu - 2.9.92-1 - Update to 2.9.92 - support punctuation candidate diff --git a/sources b/sources index cf18322..6814a27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.9.92.tar.gz) = 0ce0c950bb77511c73a5f4e587aa72dce7a5541a748d4e5cc6e9df1660146ef03d259da8c9fee42768a468f91facff489bf604ebdeafe01c5719b13e68a8b7fb +SHA512 (libpinyin-2.9.93.tar.gz) = e59ee9d4052c408f713dd17a03c500e83c6e0a0ba80ba517e3593dade4d8e2b8baf3eb9169b1f9cbb7ce12d30423ff468f698bae9b9eacac0c6c70a3a67141b8 From bf212e7bcc99bbb44cab8d10b1c40bfb6714626c Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 16 Jan 2025 15:26:02 +0800 Subject: [PATCH 12/22] Rewrite CI tests to use beakerlib framework --- plans/basic.fmf | 1 - tests/main.fmf | 6 ++++-- tests/make_check.sh | 26 -------------------------- tests/runtest.sh | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 tests/make_check.sh create mode 100755 tests/runtest.sh diff --git a/plans/basic.fmf b/plans/basic.fmf index d57536e..c1627f9 100644 --- a/plans/basic.fmf +++ b/plans/basic.fmf @@ -1,6 +1,5 @@ summary: Basic smoke test discover: how: fmf - dist-git-source: true execute: how: tmt diff --git a/tests/main.fmf b/tests/main.fmf index 3e1e10f..db4c08e 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -1,6 +1,6 @@ -test: bash ./make_check.sh .. +test: ./runtest.sh duration: 50m -framework: shell +framework: beakerlib require: - make - gcc-c++ @@ -10,4 +10,6 @@ require: - gettext-devel - glib2-devel - kyotocabinet-devel + - libpinyin + - gnome-common - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh deleted file mode 100644 index 796af33..0000000 --- a/tests/make_check.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -x - -check_return_value () { - if [ $1 != 0 ] ; then - exit $1 - fi -} - -cd $1 - -VERSION=`rpmspec -q --srpm --qf "%{version}" libpinyin.spec 2>/dev/null` - -if test -d libpinyin-$VERSION-build; -then cd libpinyin-$VERSION-build; -fi - -cd libpinyin-$VERSION - -./configure --prefix=/usr --with-dbm=KyotoCabinet --enable-libzhuyin -check_return_value $? -make -check_return_value $? -make check -exit $? diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..9a7a581 --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,35 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlShowPackageVersion libpinyin + rlRun -t -l "VERSION=$(rpm -q libpinyin --queryformat='%{version}')" 0 "Get VERSION" + FEDORA_VERSION=$(rlGetDistroRelease) + rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlFetchSrcForInstalled "libpinyin" + rlRun "rpm --define '_topdir $tmp' -i *src.rpm" + rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" + rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" + if [ -d BUILD/libpinyin-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/libpinyin-${VERSION}-build/libpinyin-${VERSION}" + else + rlRun -t -l "pushd BUILD/libpinyin-${VERSION}" + fi + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun -t -l "NOCONFIGURE=1 gnome-autogen.sh" + rlRun -t -l "./configure --with-dbm=KyotoCabinet --enable-libzhuyin" + rlRun -t -l "make" + rlRun -t -l "make check" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd; popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd From d324dcf9440cd7f84e7587a83069683aa83975e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 12:59:57 +0000 Subject: [PATCH 13/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index 56ec0b7..e7f8268 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.9.93 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.9.93-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 17 2024 Peng Wu - 2.9.93-1 - Update to 2.9.93 - bug fixes From 08bdc295537ecf4ba6bf561e929eb88a32bcb8aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:50:14 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index e7f8268..b5b394c 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.9.93 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 2.9.93-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 2.9.93-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 0def695da412d81d590ce43284fc1b294e188d8d Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Sat, 8 Feb 2025 15:46:09 +0800 Subject: [PATCH 15/22] Update to 2.10.0 --- .gitignore | 1 + libpinyin.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b44fdda..79e36e5 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /libpinyin-2.9.91.tar.gz /libpinyin-2.9.92.tar.gz /libpinyin-2.9.93.tar.gz +/libpinyin-2.10.0.tar.gz diff --git a/libpinyin.spec b/libpinyin.spec index b5b394c..543faee 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,8 +1,8 @@ %global snapshot 0 Name: libpinyin -Version: 2.9.93 -Release: 3%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Sat Feb 8 2025 Peng Wu - 2.10.0-1 +- Update to 2.10.0 +- bug fixes + * Mon Jan 20 2025 Fedora Release Engineering - 2.9.93-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 6814a27..d2c7624 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.9.93.tar.gz) = e59ee9d4052c408f713dd17a03c500e83c6e0a0ba80ba517e3593dade4d8e2b8baf3eb9169b1f9cbb7ce12d30423ff468f698bae9b9eacac0c6c70a3a67141b8 +SHA512 (libpinyin-2.10.0.tar.gz) = 329995798e15be0abfadbfb183a4afbeb09393aaf2bb95be5271edbbceb420aa623da56d96bc60559f7e428914134626a01e4799c7349c715f5ef966958b85b4 From ffbdf6b3ddd980cd5d47653a9a3fb00949127e3c Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 21 Mar 2025 11:13:00 +0800 Subject: [PATCH 16/22] Fix some bugs --- libpinyin-2.10.x-head.patch | 37 +++++++++++++++++++++++++++++++++++++ libpinyin.spec | 7 +++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/libpinyin-2.10.x-head.patch b/libpinyin-2.10.x-head.patch index e69de29..183a0a5 100644 --- a/libpinyin-2.10.x-head.patch +++ b/libpinyin-2.10.x-head.patch @@ -0,0 +1,37 @@ +commit b9bb33de5ed89b304015377f99d0827ea5929532 +Author: Peng Wu +Date: Fri Mar 14 11:35:38 2025 +0800 + + Fix some typo in the code + +diff --git a/src/pinyin.cpp b/src/pinyin.cpp +index fb06be5..dbfff64 100644 +--- a/src/pinyin.cpp ++++ b/src/pinyin.cpp +@@ -1827,7 +1827,7 @@ static void _compute_frequency_of_items(pinyin_context_t * context, + + /* handle addon candidates. */ + if (ADDON_CANDIDATE == item->m_candidate_type) { +- total_freq = context->m_phrase_index-> ++ total_freq = context->m_addon_phrase_index-> + get_phrase_index_total_freq(); + + /* assume the unigram of every addon phrases is 1. */ +@@ -3502,7 +3502,7 @@ bool pinyin_get_double_pinyin_auxiliary_text(pinyin_instance_t * instance, + g_free(middle); + middle = newmiddle; + +- offset = key_rest.m_raw_end; ++ break; + } + + gchar * auxtext = g_strconcat(prefix, middle, postfix, NULL); +@@ -3562,7 +3562,7 @@ bool pinyin_get_chewing_auxiliary_text(pinyin_instance_t * instance, + g_free(right); + g_free(zhuyin); + +- offset = key_rest.m_raw_end; ++ break; + } + + gchar * auxtext = g_strconcat(prefix, middle, postfix, NULL); diff --git a/libpinyin.spec b/libpinyin.spec index 543faee..ecf02b0 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,8 +1,8 @@ -%global snapshot 0 +%global snapshot 1 Name: libpinyin Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Fri Mar 21 2025 Peng Wu - 2.10.0-2 +- bug fixes + * Sat Feb 8 2025 Peng Wu - 2.10.0-1 - Update to 2.10.0 - bug fixes From ff77e172ece4ce69ae7e528d9e2b807e32c9dc4b Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 24 Mar 2025 11:33:29 +0800 Subject: [PATCH 17/22] Update to 2.10.1 --- .gitignore | 1 + libpinyin-2.10.x-head.patch | 37 ------------------------------------- libpinyin.spec | 10 +++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 79e36e5..785acef 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /libpinyin-2.9.92.tar.gz /libpinyin-2.9.93.tar.gz /libpinyin-2.10.0.tar.gz +/libpinyin-2.10.1.tar.gz diff --git a/libpinyin-2.10.x-head.patch b/libpinyin-2.10.x-head.patch index 183a0a5..e69de29 100644 --- a/libpinyin-2.10.x-head.patch +++ b/libpinyin-2.10.x-head.patch @@ -1,37 +0,0 @@ -commit b9bb33de5ed89b304015377f99d0827ea5929532 -Author: Peng Wu -Date: Fri Mar 14 11:35:38 2025 +0800 - - Fix some typo in the code - -diff --git a/src/pinyin.cpp b/src/pinyin.cpp -index fb06be5..dbfff64 100644 ---- a/src/pinyin.cpp -+++ b/src/pinyin.cpp -@@ -1827,7 +1827,7 @@ static void _compute_frequency_of_items(pinyin_context_t * context, - - /* handle addon candidates. */ - if (ADDON_CANDIDATE == item->m_candidate_type) { -- total_freq = context->m_phrase_index-> -+ total_freq = context->m_addon_phrase_index-> - get_phrase_index_total_freq(); - - /* assume the unigram of every addon phrases is 1. */ -@@ -3502,7 +3502,7 @@ bool pinyin_get_double_pinyin_auxiliary_text(pinyin_instance_t * instance, - g_free(middle); - middle = newmiddle; - -- offset = key_rest.m_raw_end; -+ break; - } - - gchar * auxtext = g_strconcat(prefix, middle, postfix, NULL); -@@ -3562,7 +3562,7 @@ bool pinyin_get_chewing_auxiliary_text(pinyin_instance_t * instance, - g_free(right); - g_free(zhuyin); - -- offset = key_rest.m_raw_end; -+ break; - } - - gchar * auxtext = g_strconcat(prefix, middle, postfix, NULL); diff --git a/libpinyin.spec b/libpinyin.spec index ecf02b0..98702c0 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,8 +1,8 @@ -%global snapshot 1 +%global snapshot 0 Name: libpinyin -Version: 2.10.0 -Release: 2%{?dist} +Version: 2.10.1 +Release: 1%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Mon Mar 24 2025 Peng Wu - 2.10.1-1 +- Update to 2.10.1 +- bug fixes + * Fri Mar 21 2025 Peng Wu - 2.10.0-2 - bug fixes diff --git a/sources b/sources index d2c7624..ad157d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.10.0.tar.gz) = 329995798e15be0abfadbfb183a4afbeb09393aaf2bb95be5271edbbceb420aa623da56d96bc60559f7e428914134626a01e4799c7349c715f5ef966958b85b4 +SHA512 (libpinyin-2.10.1.tar.gz) = 336a8496bb2e5382999c203e03ffdfb19062fcc7b3b11153bc08e884108f65e66666b814aee8ed6f8b7fb9ff0044a185d2ddf33425a4d0f5bc22ca729ac63e1c From f41033ac514af12214ba487bf5fbbcca2cd0df9e Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 16 May 2025 12:19:28 +0800 Subject: [PATCH 18/22] Update to 2.10.2 --- .gitignore | 1 + libpinyin.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 785acef..8a89589 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /libpinyin-2.9.93.tar.gz /libpinyin-2.10.0.tar.gz /libpinyin-2.10.1.tar.gz +/libpinyin-2.10.2.tar.gz diff --git a/libpinyin.spec b/libpinyin.spec index 98702c0..e69586d 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,7 +1,7 @@ %global snapshot 0 Name: libpinyin -Version: 2.10.1 +Version: 2.10.2 Release: 1%{?dist} Summary: Library to deal with pinyin @@ -108,6 +108,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Fri May 16 2025 Peng Wu - 2.10.2-1 +- Update to 2.10.2 +- fix memory leaks + * Mon Mar 24 2025 Peng Wu - 2.10.1-1 - Update to 2.10.1 - bug fixes diff --git a/sources b/sources index ad157d8..8543200 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.10.1.tar.gz) = 336a8496bb2e5382999c203e03ffdfb19062fcc7b3b11153bc08e884108f65e66666b814aee8ed6f8b7fb9ff0044a185d2ddf33425a4d0f5bc22ca729ac63e1c +SHA512 (libpinyin-2.10.2.tar.gz) = 120ca46df86accc9e223bc4736de955dd34009853cb19be98514ad30c283eb04df77af6e76572ff41f0ac2d853be302cf71cafff97a9fa5962316be14164d196 From a793251367b5178411cd0ef31e498a441ec1a285 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:10:58 +0000 Subject: [PATCH 19/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libpinyin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libpinyin.spec b/libpinyin.spec index e69586d..9c20eb4 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -2,7 +2,7 @@ Name: libpinyin Version: 2.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later @@ -108,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri May 16 2025 Peng Wu - 2.10.2-1 - Update to 2.10.2 - fix memory leaks From 6f6018875c413cf3755b3201f2f7ce8caa4d54b4 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 18 Sep 2025 14:30:12 +0800 Subject: [PATCH 20/22] Update to 2.10.3 --- .gitignore | 1 + libpinyin.spec | 20 ++++++-------------- sources | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 8a89589..34051a9 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /libpinyin-2.10.0.tar.gz /libpinyin-2.10.1.tar.gz /libpinyin-2.10.2.tar.gz +/libpinyin-2.10.3.tar.gz diff --git a/libpinyin.spec b/libpinyin.spec index 9c20eb4..faae14b 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,16 +1,11 @@ -%global snapshot 0 - Name: libpinyin -Version: 2.10.2 -Release: 2%{?dist} +Version: 2.10.3 +Release: 1%{?dist} Summary: Library to deal with pinyin License: GPL-3.0-or-later URL: https://github.com/libpinyin/libpinyin Source0: http://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz -%if %snapshot -Patch0: libpinyin-2.10.x-head.patch -%endif BuildRequires: gcc-c++ BuildRequires: kyotocabinet-devel, glib2-devel @@ -59,10 +54,6 @@ The libzhuyin package contains libzhuyin compatibility library. %prep %setup -q -%if %snapshot -%patch -P0 -p1 -b .head -%endif - %build %configure --disable-static \ --with-dbm=KyotoCabinet \ @@ -77,9 +68,6 @@ make check find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%ldconfig_scriptlets - - %files %doc AUTHORS COPYING README %{_libdir}/libpinyin*.so.* @@ -108,6 +96,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Thu Sep 18 2025 Peng Wu - 2.10.3-1 +- Update to 2.10.3 +- bug fixes + * Thu Jul 24 2025 Fedora Release Engineering - 2.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 8543200..6b7bd36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.10.2.tar.gz) = 120ca46df86accc9e223bc4736de955dd34009853cb19be98514ad30c283eb04df77af6e76572ff41f0ac2d853be302cf71cafff97a9fa5962316be14164d196 +SHA512 (libpinyin-2.10.3.tar.gz) = 788cc127a2e920bc02ef8d72111fabff529ad2ead2506ef6b3bc5bee9026356fe7b44707feb2f7be20ba353423a559a5e9a1cdd6c0bf2d94089baee2d8f5b543 From 21d4cd325f9c2974796802d533a5cf98bd0f2020 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 18 Sep 2025 14:59:04 +0800 Subject: [PATCH 21/22] Fix some typos --- libpinyin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpinyin.spec b/libpinyin.spec index faae14b..3f4d0d2 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -96,14 +96,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog -* Thu Sep 18 2025 Peng Wu - 2.10.3-1 +* Thu Sep 18 2025 Peng Wu - 2.10.3-1 - Update to 2.10.3 - bug fixes * Thu Jul 24 2025 Fedora Release Engineering - 2.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri May 16 2025 Peng Wu - 2.10.2-1 +* Fri May 16 2025 Peng Wu - 2.10.2-1 - Update to 2.10.2 - fix memory leaks From 30cc993ff4c0650637267647b086eb6a811f83af Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Sun, 4 Jan 2026 14:09:47 +0800 Subject: [PATCH 22/22] Update to 2.11.91 --- .gitignore | 1 + libpinyin.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 34051a9..bd90cd8 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /libpinyin-2.10.1.tar.gz /libpinyin-2.10.2.tar.gz /libpinyin-2.10.3.tar.gz +/libpinyin-2.11.91.tar.gz diff --git a/libpinyin.spec b/libpinyin.spec index 3f4d0d2..5c6ad5e 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,5 +1,5 @@ Name: libpinyin -Version: 2.10.3 +Version: 2.11.91 Release: 1%{?dist} Summary: Library to deal with pinyin @@ -96,6 +96,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Sun Jan 04 2026 Peng Wu - 2.11.91-1 +- Update to 2.11.91 +- support "sua" and "zua" pinyin input + * Thu Sep 18 2025 Peng Wu - 2.10.3-1 - Update to 2.10.3 - bug fixes diff --git a/sources b/sources index 6b7bd36..78107a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.10.3.tar.gz) = 788cc127a2e920bc02ef8d72111fabff529ad2ead2506ef6b3bc5bee9026356fe7b44707feb2f7be20ba353423a559a5e9a1cdd6c0bf2d94089baee2d8f5b543 +SHA512 (libpinyin-2.11.91.tar.gz) = cfcc5c92ab5e392119d4a78e6e2e77dc620fee65647c23c39443e20dabc0717c83c9387bf4dba3066d5ba17e904cb2ec09dc80b5fb11aef315853dff14ca5c1b