From ef323cae0d10aec1003dd633f2b255ed1aee7aed Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 15:51:47 +0000 Subject: [PATCH] import UBI libthai-0.1.29-10.el10 --- .gitignore | 11 +----- gating.yaml | 7 ---- libthai-0.1.24-gcc6.patch | 36 ------------------ libthai.spec | 80 ++++++++++++++++++++++++++++++--------- sources | 2 +- tests/make_check.sh | 17 --------- tests/tests.yml | 21 ---------- 7 files changed, 65 insertions(+), 109 deletions(-) delete mode 100644 gating.yaml delete mode 100644 libthai-0.1.24-gcc6.patch delete mode 100644 tests/make_check.sh delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 41feceb..4b0a208 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -libthai-0.1.12.tar.gz -libdatrie-0.2.2.tar.gz -/libdatrie-0.2.6.tar.xz -/libthai-0.1.19.tar.xz -/libdatrie-0.2.8.tar.xz -/libthai-0.1.20.tar.xz -/libthai-0.1.21.tar.xz -/libthai-0.1.24.tar.xz -/libthai-0.1.25.tar.xz -/libthai-0.1.27.tar.xz +libthai-0.1.29.tar.xz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index fbd311f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - # this is the testcase identifier, which OSCI pipeline uses - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/libthai-0.1.24-gcc6.patch b/libthai-0.1.24-gcc6.patch deleted file mode 100644 index 1fe65e8..0000000 --- a/libthai-0.1.24-gcc6.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog.orig -+++ ChangeLog -@@ -28,6 +28,18 @@ - - 2015-11-22 Theppitak Karoonboonyanan - -+ Fix compilation error with GCC 6 -+ -+ * include/thai/thctype.h (_th_bitmsk): -+ - Use unsigned int instead of unsigned short for bitmask base, -+ as GCC 6 takes ~0 as -1 for unsigned short, -+ and causes compilation error for scim-thai. -+ -+ Thanks Martin Michlmayr for the report via Debian #811690 -+ http://bugs.debian.org/811690 -+ -+2016-01-20 Theppitak Karoonboonyanan -+ - * configure.ac: Post-release version suffix added. - - 2015-10-22 Theppitak Karoonboonyanan -Index: include/thai/thctype.h -=================================================================== ---- include/thai/thctype.h.orig -+++ include/thai/thctype.h -@@ -363,7 +363,7 @@ extern int th_iscombchar(thchar_t c); - #include - #define _th_ISbit(bit) (1 << (bit)) - #define _th_bitfld(base, val) ((val) << (base)) --#define _th_bitmsk(base, bits) (~((~(unsigned short)0) << (bits)) << (base)) -+#define _th_bitmsk(base, bits) (~((~(unsigned)0) << (bits)) << (base)) - - enum { - _th_IStis = _th_ISbit(0), /* TIS-620 char */ diff --git a/libthai.spec b/libthai.spec index d8b8b76..ff6a860 100644 --- a/libthai.spec +++ b/libthai.spec @@ -1,16 +1,16 @@ Summary: Thai language support routines Name: libthai -Version: 0.1.27 -Release: 2%{?dist} -License: LGPLv2+ -Group: System Environment/Libraries -Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz +Version: 0.1.29 +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 URL: http://linux.thai.net -BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) +BuildRequires: gcc BuildRequires: pkgconfig(datrie-0.2) BuildRequires: doxygen +BuildRequires: make %description LibThai is a set of Thai language support routines aimed to ease @@ -20,7 +20,6 @@ output methods as well as basic character and string supports. %package devel Summary: Thai language support routines -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -32,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 @@ -52,27 +50,75 @@ rmdir $RPM_BUILD_ROOT%{_docdir}/libthai rm $RPM_BUILD_ROOT%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-, root, root) %doc README AUTHORS COPYING ChangeLog %{_libdir}/lib*.so.* %{_datadir}/libthai %files devel -%defattr(-, root, root) %doc installed-docs/* %{_includedir}/thai %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %changelog +* Tue Oct 29 2024 Troy Dawson - 0.1.29-10 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 0.1.29-9 +- Bump release for June 2024 mass rebuild + +* 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 + +* 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 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.1.29-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.1.29-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.1.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 23 2021 Peng Wu - 0.1.29-1 +- Update to 0.1.29 + +* Thu Jul 22 2021 Fedora Release Engineering - 0.1.28-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.1.28-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.1.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.1.28-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.1.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.1.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Aug 2 2018 Peng Wu - 0.1.28-1 +- Update to 0.1.28 + +* Fri Jul 13 2018 Fedora Release Engineering - 0.1.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.1.27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index aef0ec0..ded3452 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libthai-0.1.27.tar.xz) = 931ba74ab003c7670b0919fc12bf456df1b516f859f55fbf6c063341215f1743158070f6256f78c49f56641d16ab0e8b0c71b96078c448f454b1257d44b10757 +SHA512 (libthai-0.1.29.tar.xz) = 0ba1261581a1705a2a2546a3071acb3c63892dbf111f0dad415667165a6b9542a5e4549061c67b11ec53de7c9e70fceb3c04d794fd12a22d991a539dbacebda1 diff --git a/tests/make_check.sh b/tests/make_check.sh deleted file mode 100644 index a09a48b..0000000 --- a/tests/make_check.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -x - -check_return_value () { - if [ $1 != 0 ] ; then - exit $1 - fi -} - -cd $1 -./configure --prefix=/usr -check_return_value $? -make -check_return_value $? -make check -exit $? 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