Skip to content

Commit 2b60c8b

Browse files
authored
Upgrade ibus-libzhuyin to version 1.10.4 and libpinyin to version 2.10.3 (#15375)
1 parent 9e78b67 commit 2b60c8b

5 files changed

Lines changed: 29 additions & 42 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"ibus-libzhuyin-1.9.1.tar.gz": "f0a322700aec3a00dc7c3a4a185f7ad7b1d27a989614b5b50c6aec39a03cf585"
3+
"ibus-libzhuyin-1.10.4.tar.gz": "c21a3e1d7a8d9e6357f5ed0e3246111868b3fda04fcbb8cc726dab2d6363f265"
44
}
55
}

SPECS-EXTENDED/ibus-libzhuyin/ibus-libzhuyin.spec

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3-
# This package depends on automagic byte compilation
4-
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
5-
%global _python_bytecompile_extra 1
6-
7-
%global snapshot 0
83

94
Name: ibus-libzhuyin
10-
Version: 1.9.1
11-
Release: 6%{?dist}
5+
Version: 1.10.4
6+
Release: 1%{?dist}
127
Summary: New Zhuyin engine based on libzhuyin for IBus
138
License: GPLv2+
149
URL: https://github.com/libzhuyin/ibus-libzhuyin
15-
Source0: http://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/%{name}-%{version}.tar.gz
16-
%if %snapshot
17-
Patch0: ibus-libzhuyin-1.9.x-HEAD.patch
18-
%endif
10+
Source0: https://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/%{name}-%{version}.tar.gz
1911

2012
BuildRequires: gcc-c++
21-
BuildRequires: perl(File::Find)
2213
BuildRequires: gettext-devel
2314
BuildRequires: intltool
2415
BuildRequires: libtool
@@ -40,29 +31,27 @@ It includes a Chinese Zhuyin (Bopomofo) input method
4031
based on libzhuyin for IBus.
4132

4233
%prep
43-
%setup -q
44-
%if %snapshot
45-
%patch 0 -p1 -b .head
46-
%endif
47-
34+
%autosetup
4835

4936
%build
5037
%configure --disable-static \
5138
--disable-boost \
5239
--with-python=python3
5340

5441
# make -C po update-gmo
55-
make %{?_smp_mflags} V=1
42+
%make_build
5643

5744
%install
58-
make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
45+
%make_install
46+
47+
%py_byte_compile %{python3} $RPM_BUILD_ROOT%{_datadir}/ibus-libzhuyin/setup
5948

6049
%find_lang %{name}
6150

6251
%files -f %{name}.lang
6352
%license COPYING
6453
%doc AUTHORS README ChangeLog INSTALL NEWS
65-
%{_datadir}/appdata/*.appdata.xml
54+
%{_datadir}/metainfo/*.appdata.xml
6655
%{_datadir}/glib-2.0/schemas/*.gschema.xml
6756
%{_datadir}/applications/ibus-setup-libzhuyin.desktop
6857
%{_libexecdir}/ibus-engine-libzhuyin
@@ -74,8 +63,11 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
7463
%{_datadir}/ibus-libzhuyin/*symbol.txt
7564
%{_libdir}/ibus-libzhuyin/
7665

77-
7866
%changelog
67+
* Mon Dec 22 2025 Aditya Singh <v-aditysing@microsoft.com> - 1.10.4-1
68+
- Upgrade to version 1.10.4
69+
- License verified.
70+
7971
* Wed Feb 16 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.9.1-6
8072
- License verified.
8173

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"libpinyin-2.9.92.tar.gz": "f816515a6cb7c9a134cb5214de2a3403f03da4791a38d62be45a6fa91ee7e4d9"
3+
"libpinyin-2.10.3.tar.gz": "3fe786ff2c2059bdbdf9d8d752db691a516a941a977521955fe0af3f0b4db299"
44
}
55
}

SPECS-EXTENDED/libpinyin/libpinyin.spec

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3-
%global snapshot 0
43

54
Name: libpinyin
6-
Version: 2.9.92
5+
Version: 2.10.3
76
Release: 1%{?dist}
87
Summary: Library to deal with pinyin
98

109
License: GPL-3.0-or-later
1110
URL: https://github.com/libpinyin/libpinyin
1211
Source0: https://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz
13-
%if %snapshot
14-
Patch0: libpinyin-2.8.x-head.patch
15-
%endif
1612

1713
BuildRequires: gcc-c++
1814
BuildRequires: kyotocabinet-devel, glib2-devel
@@ -57,32 +53,27 @@ Requires: %{name} = %{version}-%{release}
5753
%description -n libzhuyin
5854
The libzhuyin package contains libzhuyin compatibility library.
5955

60-
6156
%prep
62-
%setup -q
63-
64-
%if %snapshot
65-
%patch -P0 -p1 -b .head
66-
%endif
57+
%autosetup
6758

6859
%build
6960
%configure --disable-static \
7061
--with-dbm=KyotoCabinet \
7162
--enable-libzhuyin
7263
%make_build
64+
7365
%check
7466
make check
7567

7668
%install
77-
%make_install
69+
%make_install DESTDIR=$RPM_BUILD_ROOT
7870
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
7971

80-
8172
%ldconfig_scriptlets
8273

83-
8474
%files
85-
%doc AUTHORS COPYING README
75+
%doc AUTHORS README
76+
%license COPYING
8677
%{_libdir}/libpinyin*.so.*
8778
%dir %{_libdir}/libpinyin
8879

@@ -109,6 +100,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
109100
%{_libdir}/libzhuyin*.so.*
110101

111102
%changelog
103+
* Mon Dec 22 2025 Aditya Singh <v-aditysing@microsoft.com> - 2.10.3-1
104+
- Upgrade to version 2.10.3
105+
- License verified
106+
112107
* Mon Nov 11 2024 Sumit Jena <v-sumitjena@microsoft.com> - 2.9.92-1
113108
- Update to version 2.9.92
114109
- License verified

cgmanifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7100,8 +7100,8 @@
71007100
"type": "other",
71017101
"other": {
71027102
"name": "ibus-libzhuyin",
7103-
"version": "1.9.1",
7104-
"downloadUrl": "http://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/ibus-libzhuyin-1.9.1.tar.gz"
7103+
"version": "1.10.4",
7104+
"downloadUrl": "https://downloads.sourceforge.net/libzhuyin/ibus-libzhuyin/ibus-libzhuyin-1.10.4.tar.gz"
71057105
}
71067106
}
71077107
},
@@ -10761,8 +10761,8 @@
1076110761
"type": "other",
1076210762
"other": {
1076310763
"name": "libpinyin",
10764-
"version": "2.9.92",
10765-
"downloadUrl": "https://downloads.sourceforge.net/libpinyin/libpinyin/libpinyin-2.9.92.tar.gz"
10764+
"version": "2.10.3",
10765+
"downloadUrl": "https://downloads.sourceforge.net/libpinyin/libpinyin/libpinyin-2.10.3.tar.gz"
1076610766
}
1076710767
}
1076810768
},

0 commit comments

Comments
 (0)