From ad243956f6f4ecd306fe745d9359dc126ff41c9a Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 17 May 2023 15:50:11 +0800 Subject: [PATCH 01/11] Migrate to SPDX license --- libthai.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libthai.spec b/libthai.spec index 847dce2..0a075dc 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,8 +1,8 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 4%{?dist} -License: LGPLv2+ +Release: 5%{?dist} +License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch URL: http://linux.thai.net @@ -31,8 +31,7 @@ Install libthai-devel if you want to develop programs which will use libthai. %prep -%setup -q -%patch0 -p1 -b .multilib +%autosetup -p1 %build %configure --disable-static @@ -65,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Wed May 17 2023 Peng Wu - 0.1.29-5 +- Migrate to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 0.1.29-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2e279c7cf4492d55549220babe0c794b15aefa43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:16:46 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 0a075dc..6ff1608 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.1.29-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 17 2023 Peng Wu - 0.1.29-5 - Migrate to SPDX license From 1e6676b31cc9b84429ba02a1b789358fbc1d462b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:29:59 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 6ff1608..ed20199 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.1.29-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.1.29-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 06573c30504ed93479200238b9f729d5dd83eebf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 03:41:43 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index ed20199..87a0474 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.1.29-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.1.29-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 26a19fa26cc7d1b50848ca36c22d87809183b623 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Fri, 31 May 2024 11:51:36 +0800 Subject: [PATCH 05/11] Rewrite CI tests --- .fmf/version | 1 + plans/basic.fmf | 6 ++++++ tests/main.fmf | 13 +++++++++++++ tests/make_check.sh | 9 +++++++++ tests/tests.yml | 21 --------------------- 5 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/tests.yml 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/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..d57536e --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,6 @@ +summary: Basic smoke test +discover: + how: fmf + dist-git-source: true +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..5241982 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,13 @@ +test: bash ./make_check.sh .. +duration: 50m +framework: shell +require: + - make + - gcc + - autoconf + - autoconf-archive + - automake + - libtool + - doxygen + - libdatrie-devel + - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh index a09a48b..e2f16d0 100644 --- a/tests/make_check.sh +++ b/tests/make_check.sh @@ -9,6 +9,15 @@ check_return_value () { } cd $1 + +VERSION=`rpmspec -q --srpm --qf "%{version}" libthai.spec 2>/dev/null` + +if test -d libthai-$VERSION-build; +then cd libthai-$VERSION-build; +fi + +cd libthai-$VERSION + ./configure --prefix=/usr check_return_value $? make diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 73a8820..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,21 +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 - - autoconf - - automake - - libtool - - doxygen - - libdatrie-devel - tests: - - make-check: - dir: ./ - run: bash ./make_check.sh ./source From a78d349d5876de896c6d7c044d94f8764dae2a4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:15:17 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 87a0474..71388a1 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.1.29-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.1.29-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4d768f2043a003353d9991bda6f1d0f021918ea7 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Thu, 16 Jan 2025 16:07:23 +0800 Subject: [PATCH 07/11] Rewrite CI tests to use beakerlib framework --- plans/basic.fmf | 1 - tests/main.fmf | 6 ++++-- tests/make_check.sh | 26 -------------------------- tests/runtest.sh | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 tests/make_check.sh create mode 100755 tests/runtest.sh diff --git a/plans/basic.fmf b/plans/basic.fmf index d57536e..c1627f9 100644 --- a/plans/basic.fmf +++ b/plans/basic.fmf @@ -1,6 +1,5 @@ summary: Basic smoke test discover: how: fmf - dist-git-source: true execute: how: tmt diff --git a/tests/main.fmf b/tests/main.fmf index 5241982..5c33677 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -1,6 +1,6 @@ -test: bash ./make_check.sh .. +test: ./runtest.sh duration: 50m -framework: shell +framework: beakerlib require: - make - gcc @@ -10,4 +10,6 @@ require: - libtool - doxygen - libdatrie-devel + - libthai + - gnome-common - rpm-build diff --git a/tests/make_check.sh b/tests/make_check.sh deleted file mode 100644 index e2f16d0..0000000 --- a/tests/make_check.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -set -x - -check_return_value () { - if [ $1 != 0 ] ; then - exit $1 - fi -} - -cd $1 - -VERSION=`rpmspec -q --srpm --qf "%{version}" libthai.spec 2>/dev/null` - -if test -d libthai-$VERSION-build; -then cd libthai-$VERSION-build; -fi - -cd libthai-$VERSION - -./configure --prefix=/usr -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..07ca06b --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,35 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlShowPackageVersion libthai + rlRun -t -l "VERSION=$(rpm -q libthai --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 "libthai" + 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/libthai-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/libthai-${VERSION}-build/libthai-${VERSION}" + else + rlRun -t -l "pushd BUILD/libthai-${VERSION}" + fi + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun -t -l "NOCONFIGURE=1 gnome-autogen.sh" + rlRun -t -l "./configure" + rlRun -t -l "make" + rlRun -t -l "make check" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd; popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd From 57b5ab532bf7b3bf5475824ec939882c5632b1eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 14:22:01 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index 71388a1..c67ac32 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.1.29-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.1.29-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e058c897b4571cc883f18e7e4a24ceeed49fd7e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:26:57 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libthai.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libthai.spec b/libthai.spec index c67ac32..aabb0bb 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai Version: 0.1.29 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.1.29-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.1.29-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6472895adf8815d7e8c08c276b76923ca7955b07 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Jan 2026 13:04:58 +0800 Subject: [PATCH 10/11] Update to 0.1.30 --- .gitignore | 1 + libthai.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 819235a..8206501 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libdatrie-0.2.2.tar.gz /libthai-0.1.27.tar.xz /libthai-0.1.28.tar.xz /libthai-0.1.29.tar.xz +/libthai-0.1.30.tar.xz diff --git a/libthai.spec b/libthai.spec index aabb0bb..e254c39 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,7 +1,7 @@ Summary: Thai language support routines Name: libthai -Version: 0.1.29 -Release: 11%{?dist} +Version: 0.1.30 +Release: 1%{?dist} License: LGPL-2.1-or-later Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz Patch0: libthai-0.1.9-multilib.patch @@ -64,6 +64,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/* %changelog +* Mon Jan 05 2026 Peng Wu - 0.1.30-1 +- Update to 0.1.30 +- Resolves: RHBZ#2426765 + * Thu Jul 24 2025 Fedora Release Engineering - 0.1.29-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index ded3452..8f9e768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libthai-0.1.29.tar.xz) = 0ba1261581a1705a2a2546a3071acb3c63892dbf111f0dad415667165a6b9542a5e4549061c67b11ec53de7c9e70fceb3c04d794fd12a22d991a539dbacebda1 +SHA512 (libthai-0.1.30.tar.xz) = c84d575b6855d54b1ea1d9878a94153ba7807cc736f7bf01327d17a6444c6fd4b18deae2ab5a2612847892c9d94ed4ceb54fbf25244aa6eb88a3605260ad328e From ef30654345e9a7a5097d2e8884fe009ee195d5f0 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Mon, 5 Jan 2026 13:25:14 +0800 Subject: [PATCH 11/11] Update libthai-0.1.9-multilib.patch --- libthai-0.1.9-multilib.patch | 14 +++++++------- libthai.spec | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libthai-0.1.9-multilib.patch b/libthai-0.1.9-multilib.patch index 58522cf..176fc46 100644 --- a/libthai-0.1.9-multilib.patch +++ b/libthai-0.1.9-multilib.patch @@ -1,9 +1,9 @@ -Index: libthai-0.1.24/doc/Doxyfile.in +Index: libthai-0.1.30/doc/Doxyfile.in =================================================================== ---- libthai-0.1.24.orig/doc/Doxyfile.in -+++ libthai-0.1.24/doc/Doxyfile.in -@@ -1124,7 +1124,7 @@ HTML_HEADER = - # that doxygen normally uses. +--- libthai-0.1.30.orig/doc/Doxyfile.in ++++ libthai-0.1.30/doc/Doxyfile.in +@@ -1432,7 +1432,7 @@ HTML_HEADER = + # that Doxygen normally uses. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_FOOTER = @@ -11,10 +11,10 @@ Index: libthai-0.1.24/doc/Doxyfile.in # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style # sheet that is used by each HTML page. It can be used to fine-tune the look of -Index: libthai-0.1.24/doc/no_date_footer.html +Index: libthai-0.1.30/doc/no_date_footer.html =================================================================== --- /dev/null -+++ libthai-0.1.24/doc/no_date_footer.html ++++ libthai-0.1.30/doc/no_date_footer.html @@ -0,0 +1,7 @@ +
+Generated for $projectname by