From ba1664562509eb55b169ce1c96dbbbb0e89e3d94 Mon Sep 17 00:00:00 2001 From: Sandeep Karambelkar Date: Mon, 22 Dec 2025 09:49:27 +0000 Subject: [PATCH] ibus-libzhuyin and libpinyin upgrade build fix for reference --- .../ibus-libzhuyin.signatures.json | 4 ++-- .../ibus-libzhuyin/ibus-libzhuyin.spec | 19 +++---------------- .../libpinyin/libpinyin.signatures.json | 4 ++-- SPECS-EXTENDED/libpinyin/libpinyin.spec | 8 ++++---- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.signatures.json b/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.signatures.json index 2b63df129d9..57d4b2ec70c 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" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.spec b/SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.spec index 94887b96b33..23feb77e362 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 BuildRequires: gcc-c++ -BuildRequires: perl(File::Find) BuildRequires: gettext-devel BuildRequires: intltool BuildRequires: libtool @@ -41,16 +32,12 @@ based on libzhuyin for IBus. %prep %setup -q -%if %snapshot -%patch 0 -p1 -b .head -%endif - %build %configure --disable-static \ --disable-boost \ --with-python=python3 - +#exit 1 # make -C po update-gmo make %{?_smp_mflags} V=1 diff --git a/SPECS-EXTENDED/libpinyin/libpinyin.signatures.json b/SPECS-EXTENDED/libpinyin/libpinyin.signatures.json index 402aefe7594..aac2bbeb813 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" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/libpinyin/libpinyin.spec b/SPECS-EXTENDED/libpinyin/libpinyin.spec index 6e083826f9f..33a0eac9c68 100644 --- a/SPECS-EXTENDED/libpinyin/libpinyin.spec +++ b/SPECS-EXTENDED/libpinyin/libpinyin.spec @@ -3,7 +3,7 @@ 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 @@ -70,11 +70,12 @@ The libzhuyin package contains libzhuyin compatibility library. --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 {} ';' @@ -90,9 +91,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %doc %dir %{_includedir}/libpinyin-%{version} %{_includedir}/libpinyin-%{version}/* -%{_libdir}/libpinyin.so +%{_libdir}/*.so %{_libdir}/pkgconfig/libpinyin.pc -%{_libdir}/libzhuyin.so %{_libdir}/pkgconfig/libzhuyin.pc %files data