From 2dfbf1ca17425c4da638e1a2605b743e6636cb06 Mon Sep 17 00:00:00 2001 From: Aditya Singh Date: Tue, 23 Dec 2025 04:51:25 +0000 Subject: [PATCH 1/2] Upgrade ibus-libzhuyin to version 1.10.4 and libpinyin to version 2.10.3 --- .../ibus-libzhuyin.signatures.json | 2 +- .../ibus-libzhuyin/ibus-libzhuyin.spec | 34 +++++++------------ .../libpinyin/libpinyin.signatures.json | 2 +- SPECS-EXTENDED/libpinyin/libpinyin.spec | 22 +++++------- cgmanifest.json | 8 ++--- 5 files changed, 27 insertions(+), 41 deletions(-) diff --git a/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.signatures.json b/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.signatures.json index 2b63df129d9..54c7a6cb24a 100644 --- a/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.signatures.json +++ b/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "ibus-libzhuyin-1.9.1.tar.gz": "f0a322700aec3a00dc7c3a4a185f7ad7b1d27a989614b5b50c6aec39a03cf585" + "ibus-libzhuyin-1.10.4.tar.gz": "c21a3e1d7a8d9e6357f5ed0e3246111868b3fda04fcbb8cc726dab2d6363f265" } } diff --git a/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.spec b/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.spec index 94887b96b33..b293550dd32 100644 --- a/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.spec +++ b/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.spec @@ -1,24 +1,15 @@ Vendor: Microsoft Corporation Distribution: Azure Linux -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - -%global snapshot 0 Name: ibus-libzhuyin -Version: 1.9.1 -Release: 6%{?dist} +Version: 1.10.4 +Release: 1%{?dist} Summary: New Zhuyin engine based on libzhuyin for IBus License: GPLv2+ URL: https://github.com/libzhuyin/ibus-libzhuyin -Source0: http://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/%{name}-%{version}.tar.gz -%if %snapshot -Patch0: ibus-libzhuyin-1.9.x-HEAD.patch -%endif +Source0: https://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: perl(File::Find) BuildRequires: gettext-devel BuildRequires: intltool BuildRequires: libtool @@ -40,11 +31,7 @@ It includes a Chinese Zhuyin (Bopomofo) input method based on libzhuyin for IBus. %prep -%setup -q -%if %snapshot -%patch 0 -p1 -b .head -%endif - +%autosetup %build %configure --disable-static \ @@ -52,17 +39,19 @@ based on libzhuyin for IBus. --with-python=python3 # make -C po update-gmo -make %{?_smp_mflags} V=1 +%make_build %install -make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" +%make_install + +%py_byte_compile %{python3} $RPM_BUILD_ROOT%{_datadir}/ibus-libzhuyin/setup %find_lang %{name} %files -f %{name}.lang %license COPYING %doc AUTHORS README ChangeLog INSTALL NEWS -%{_datadir}/appdata/*.appdata.xml +%{_datadir}/metainfo/*.appdata.xml %{_datadir}/glib-2.0/schemas/*.gschema.xml %{_datadir}/applications/ibus-setup-libzhuyin.desktop %{_libexecdir}/ibus-engine-libzhuyin @@ -74,8 +63,11 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p" %{_datadir}/ibus-libzhuyin/*symbol.txt %{_libdir}/ibus-libzhuyin/ - %changelog +* Mon Dec 22 2025 Aditya Singh - 1.10.4-1 +- Upgrade to version 1.10.4 +- License verified. + * Wed Feb 16 2022 Pawel Winogrodzki - 1.9.1-6 - License verified. diff --git a/SPECS-EXTENDED/libpinyin/libpinyin.signatures.json b/SPECS-EXTENDED/libpinyin/libpinyin.signatures.json index 402aefe7594..b6026bff412 100644 --- a/SPECS-EXTENDED/libpinyin/libpinyin.signatures.json +++ b/SPECS-EXTENDED/libpinyin/libpinyin.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libpinyin-2.9.92.tar.gz": "f816515a6cb7c9a134cb5214de2a3403f03da4791a38d62be45a6fa91ee7e4d9" + "libpinyin-2.10.3.tar.gz": "3fe786ff2c2059bdbdf9d8d752db691a516a941a977521955fe0af3f0b4db299" } } diff --git a/SPECS-EXTENDED/libpinyin/libpinyin.spec b/SPECS-EXTENDED/libpinyin/libpinyin.spec index 6e083826f9f..1f975095fbd 100644 --- a/SPECS-EXTENDED/libpinyin/libpinyin.spec +++ b/SPECS-EXTENDED/libpinyin/libpinyin.spec @@ -1,18 +1,14 @@ Vendor: Microsoft Corporation Distribution: Azure Linux -%global snapshot 0 Name: libpinyin -Version: 2.9.92 +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: https://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz -%if %snapshot -Patch0: libpinyin-2.8.x-head.patch -%endif BuildRequires: gcc-c++ BuildRequires: kyotocabinet-devel, glib2-devel @@ -57,30 +53,24 @@ Requires: %{name} = %{version}-%{release} %description -n libzhuyin The libzhuyin package contains libzhuyin compatibility library. - %prep -%setup -q - -%if %snapshot -%patch -P0 -p1 -b .head -%endif +%autosetup %build %configure --disable-static \ --with-dbm=KyotoCabinet \ --enable-libzhuyin %make_build + %check make check %install -%make_install +%make_install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - %ldconfig_scriptlets - %files %doc AUTHORS COPYING README %{_libdir}/libpinyin*.so.* @@ -109,6 +99,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/libzhuyin*.so.* %changelog +* Mon Dec 22 2025 Aditya Singh - 2.10.3-1 +- Upgrade to version 2.10.3 +- License verified + * Mon Nov 11 2024 Sumit Jena - 2.9.92-1 - Update to version 2.9.92 - License verified diff --git a/cgmanifest.json b/cgmanifest.json index 193fc5209d8..24e97990c08 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -7100,8 +7100,8 @@ "type": "other", "other": { "name": "ibus-libzhuyin", - "version": "1.9.1", - "downloadUrl": "http://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/ibus-libzhuyin-1.9.1.tar.gz" + "version": "1.10.4", + "downloadUrl": "https://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/ibus-libzhuyin-1.10.4.tar.gz" } } }, @@ -10761,8 +10761,8 @@ "type": "other", "other": { "name": "libpinyin", - "version": "2.9.92", - "downloadUrl": "https://downloads.sourceforge.net/libpinyin/libpinyin/libpinyin-2.9.92.tar.gz" + "version": "2.10.3", + "downloadUrl": "https://downloads.sourceforge.net/libpinyin/libpinyin/libpinyin-2.10.3.tar.gz" } } }, From de2a7d94c328c40762eecb014069e106a03aee90 Mon Sep 17 00:00:00 2001 From: Aditya Singh Date: Tue, 23 Dec 2025 08:16:29 +0000 Subject: [PATCH 2/2] Addressed license issue in libpinyin --- SPECS-EXTENDED/libpinyin/libpinyin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPECS-EXTENDED/libpinyin/libpinyin.spec b/SPECS-EXTENDED/libpinyin/libpinyin.spec index 1f975095fbd..4c3014f8d39 100644 --- a/SPECS-EXTENDED/libpinyin/libpinyin.spec +++ b/SPECS-EXTENDED/libpinyin/libpinyin.spec @@ -72,7 +72,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %ldconfig_scriptlets %files -%doc AUTHORS COPYING README +%doc AUTHORS README +%license COPYING %{_libdir}/libpinyin*.so.* %dir %{_libdir}/libpinyin