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/.gitignore b/.gitignore index eeb64c0..bd90cd8 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,11 @@ /libpinyin-2.7.92.tar.gz /libpinyin-2.8.0.tar.gz /libpinyin-2.8.1.tar.gz +/libpinyin-2.9.91.tar.gz +/libpinyin-2.9.92.tar.gz +/libpinyin-2.9.93.tar.gz +/libpinyin-2.10.0.tar.gz +/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-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 2ceaf87..5c6ad5e 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,20 +1,15 @@ -%global snapshot 0 - Name: libpinyin -Version: 2.8.1 -Release: 2%{?dist} +Version: 2.11.91 +Release: 1%{?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 -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 @@ -59,13 +54,9 @@ The libzhuyin package contains libzhuyin compatibility library. %prep %setup -q -%if %snapshot -%patch0 -p1 -b .head -%endif - %build %configure --disable-static \ - --with-dbm=BerkeleyDB \ + --with-dbm=KyotoCabinet \ --enable-libzhuyin %make_build @@ -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,69 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 +- 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 + +* 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 + +* 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 + +* 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 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/sources b/sources index c93434d..78107a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.8.1.tar.gz) = cf344d12ba31b72fd63e39345a294f8507533db7b2cea3df69214fee7f62068823832587907e78df44aeb035990e9dbc5fd4eb5ee95a757158fc165abb986b91 +SHA512 (libpinyin-2.11.91.tar.gz) = cfcc5c92ab5e392119d4a78e6e2e77dc620fee65647c23c39443e20dabc0717c83c9387bf4dba3066d5ba17e904cb2ec09dc80b5fb11aef315853dff14ca5c1b diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..db4c08e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,15 @@ +test: ./runtest.sh +duration: 50m +framework: beakerlib +require: + - make + - gcc-c++ + - autoconf + - automake + - libtool + - 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 3bd1ab7..0000000 --- a/tests/make_check.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -x - -check_return_value () { - if [ $1 != 0 ] ; then - exit $1 - fi -} - -cd $1 -./configure --prefix=/usr --with-dbm=BerkeleyDB --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 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