diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index bd90cd8..969d4a5 100644 --- a/.gitignore +++ b/.gitignore @@ -47,20 +47,3 @@ /libpinyin-2.2.1.tar.gz /libpinyin-2.2.2.tar.gz /libpinyin-2.3.0.tar.gz -/libpinyin-2.4.91.tar.gz -/libpinyin-2.4.92.tar.gz -/libpinyin-2.6.0.tar.gz -/libpinyin-2.6.1.tar.gz -/libpinyin-2.6.2.tar.gz -/libpinyin-2.7.91.tar.gz -/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.10.x-head.patch b/libpinyin-2.3.x-head.patch similarity index 100% rename from libpinyin-2.10.x-head.patch rename to libpinyin-2.3.x-head.patch diff --git a/libpinyin.spec b/libpinyin.spec index 5c6ad5e..7c9fc85 100644 --- a/libpinyin.spec +++ b/libpinyin.spec @@ -1,15 +1,19 @@ +%global snapshot 0 + Name: libpinyin -Version: 2.11.91 -Release: 1%{?dist} +Version: 2.3.0 +Release: 2%{?dist} Summary: Library to deal with pinyin -License: GPL-3.0-or-later +License: GPLv3+ URL: https://github.com/libpinyin/libpinyin Source0: http://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz +%if %snapshot +Patch0: libpinyin-2.3.x-head.patch +%endif BuildRequires: gcc-c++ BuildRequires: kyotocabinet-devel, glib2-devel -BuildRequires: make Requires: %{name}-data%{?_isa} = %{version}-%{release} %description @@ -20,7 +24,6 @@ for intelligent sentence-based Chinese pinyin input methods. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} -Requires: libzhuyin = %{version}-%{release} Provides: libzhuyin-devel = %{version}-%{release} Obsoletes: libzhuyin-devel < %{version}-%{release} @@ -54,20 +57,27 @@ The libzhuyin package contains libzhuyin compatibility library. %prep %setup -q +%if %snapshot +%patch0 -p1 -b .head +%endif + %build %configure --disable-static \ --with-dbm=KyotoCabinet \ --enable-libzhuyin -%make_build +make %{?_smp_mflags} %check make check %install -%make_install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%ldconfig_scriptlets + + %files %doc AUTHORS COPYING README %{_libdir}/libpinyin*.so.* @@ -96,136 +106,6 @@ 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 - -* Mon Jan 16 2023 Peng Wu - 2.8.1-1 -- Update to 2.8.1 -- bug fixes - -* Wed Jan 4 2023 Peng Wu - 2.8.0-1 -- Update to 2.8.0 -- bug fixes for ARMv7 - -* Wed Oct 19 2022 Peng Wu - 2.7.92-1 -- Update to 2.7.92 -- bug fixes - -* Wed Oct 19 2022 Peng Wu - 2.7.91-1 -- Update to 2.7.91 -- improve suggestion candidates -- support longer candidates - -* Thu Jul 21 2022 Fedora Release Engineering - 2.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Apr 13 2022 Peng Wu - 2.6.2-1 -- Update to 2.6.2 -- bug fixes - -* Thu Jan 20 2022 Fedora Release Engineering - 2.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Oct 27 2021 Peng Wu - 2.6.1-2 -- Rebuild the package - -* Wed Sep 15 2021 Peng Wu - 2.6.1-1 -- Update to 2.6.1 -- bug fixes - -* Thu Jul 22 2021 Fedora Release Engineering - 2.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 15 2020 Peng Wu - 2.6.0-1 -- Update to 2.6.0 -- bug fixes - -* Thu Oct 22 2020 Peng Wu - 2.4.92-1 -- Update to 2.4.92 -- update pinyin data -- bug fixes - -* Wed Aug 26 2020 Peng Wu - 2.4.91-1 -- Update to 2.4.91 -- improve full pinyin auto correction -- bug fixes - -* Tue Jul 28 2020 Fedora Release Engineering - 2.3.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Tom Stellard - 2.3.0-4 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Wed Jan 29 2020 Fedora Release Engineering - 2.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Thu Jul 25 2019 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/plans/basic.fmf b/plans/basic.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/basic.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 78107a0..6994a67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpinyin-2.11.91.tar.gz) = cfcc5c92ab5e392119d4a78e6e2e77dc620fee65647c23c39443e20dabc0717c83c9387bf4dba3066d5ba17e904cb2ec09dc80b5fb11aef315853dff14ca5c1b +SHA512 (libpinyin-2.3.0.tar.gz) = 269750b66d7a81ebc0c465cd3571f96112fe85e3a9284b5cad6554dd6c55a4178e4ccd8139148d05cd361e756c486ec575550444f1205562c46195b6fce51ec8 diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index db4c08e..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,15 +0,0 @@ -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/runtest.sh b/tests/runtest.sh deleted file mode 100755 index 9a7a581..0000000 --- a/tests/runtest.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/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