From 0579870dc9a2b15ed974ada40d1330a408e9dc3b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:24:24 +0000 Subject: [PATCH] import RHEL 10 Beta m17n-lib-1.8.4-4.el10 --- .gitignore | 8 +-- gating.yaml | 6 -- m17n-lib.spec | 134 ++++++++++++++++++++++++++++++++++++----- sources | 2 +- tests/smoke/hello.txt | 15 ----- tests/smoke/old.png | Bin 7753 -> 0 bytes tests/smoke/runtest.sh | 20 ------ tests/tests.yml | 11 ---- 8 files changed, 122 insertions(+), 74 deletions(-) delete mode 100644 gating.yaml delete mode 100644 tests/smoke/hello.txt delete mode 100644 tests/smoke/old.png delete mode 100644 tests/smoke/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 742086d..afb662e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -m17n-lib-1.6.1.tar.gz -/m17n-lib-1.6.2.tar.gz -/m17n-lib-1.6.3.tar.gz -/m17n-lib-1.6.4.tar.gz -/m17n-lib-1.7.0.tar.gz -/m17n-lib-1.8.0RC.tar.gz -/m17n-lib-1.8.0.tar.gz +m17n-lib-1.8.4.tar.gz diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 6985029..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/m17n-lib.spec b/m17n-lib.spec index 85aaf45..39a2d0a 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -1,13 +1,21 @@ +# note this duplicates native anthy IMEs +%if 0%{?fedora} +%bcond_without anthy +%else +%bcond_with anthy +%endif + Name: m17n-lib -Version: 1.8.0 -Release: 2%{?dist} +Version: 1.8.4 +Release: 4%{?dist} Summary: Multilingual text library -License: LGPLv2+ +License: LGPL-2.1-or-later URL: http://www.nongnu.org/m17n/ Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz Patch0: %{name}-1.8.0-multilib.patch +BuildRequires: make BuildRequires: m17n-db-devel libthai-devel BuildRequires: libxml2-devel libXft-devel BuildRequires: fontconfig-devel freetype-devel @@ -16,6 +24,14 @@ BuildRequires: libXaw-devel libotf-devel BuildRequires: autoconf gettext-devel BuildRequires: automake libtool +# The upstream source contains part of gnulib +# library which includes directories intl and m4 +Provides: bundled(gnulib) + +%if %{with anthy} +BuildRequires: anthy-devel +%endif + Requires: m17n-db %description @@ -24,6 +40,15 @@ the input of many languages with the input table maps from m17n-db. The package provides the core and input method backend libraries. +%if %{with anthy} +%package anthy +Summary: Anthy module for m17n +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description anthy +Anthy module for %{name} allows ja-anthy.mim to support input conversion. +%endif + %package devel Summary: Development files for %{name} Requires: %{name}-tools = %{version}-%{release} @@ -42,7 +67,7 @@ Tools to test M17n GUI widget library. %prep -%autosetup +%autosetup -p1 %build #autoreconf -ivf @@ -50,8 +75,7 @@ Tools to test M17n GUI widget library. sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -# parallel make usage with make command fails build on koji -make +%{make_build} %install make install DESTDIR=%{buildroot} INSTALL="install -p" @@ -59,16 +83,15 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" # fix bug rh#680363 rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-ispell.so -# fix for bug rh#1587975 +%if %{without anthy} rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-anthy.so +%endif find %{buildroot} -name '*.la' -exec rm -f {} ';' -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets -%post tools -p /sbin/ldconfig -%postun tools -p /sbin/ldconfig +%ldconfig_scriptlets tools %files %doc AUTHORS NEWS ChangeLog README @@ -81,6 +104,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libm17n-core.so.* %{_libdir}/libm17n-flt.so.* +#Anthy module +%if %{with anthy} +%files anthy +%{_libdir}/m17n/1.0/libmimx-anthy.so +%endif + %files devel %{_includedir}/* %{_libdir}/lib*.so @@ -96,9 +125,86 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libm17n-gui.so.* %changelog -* Wed Jun 06 2018 Parag Nemade - 1.8.0-2 -- Drop Anthy support in favor of libkkc -- Resolves: rh#1587975 +* Mon Jun 24 2024 Troy Dawson - 1.8.4-4 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.8.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Aug 23 2023 Mike FABIAN - 1.8.4-1 +- Update to 1.8.4 +- Fixes “typedef in m17n-core.h causing error when compiling with C++ code” + (Resolves: https://savannah.nongnu.org/bugs/index.php?64566) + +* Wed Jul 26 2023 Björn Esser - 1.8.3-2 +- Rebuild(libotf) + +* Tue Jul 25 2023 Mike FABIAN - 1.8.3-1 +- Update to 1.8.3 +- Fixes to be able to create m17n-docs-1.8.3: Fix doxygen tags, change all EUC-JP files to UTF-8 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue May 09 2023 Mike FABIAN - 1.8.2-1 +- Update to 1.8.2 +- Fix parallel builds by switching from absolute to relative paths + (Resolves: https://savannah.nongnu.org/bugs/index.php?61377) +- enable parallel builds in the spec file + +- Update to 1.8.1 +- Remove m17n-lib-c99.patch (included upstream) +- Remove Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch + (included upstream) + +* Tue Apr 25 2023 Florian Weimer - 1.8.0-16 +- Fix C99 compatibility issue in example code + +* Thu Jan 19 2023 Fedora Release Engineering - 1.8.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 30 2022 Mike FABIAN - 1.8.0-14 +- Migrate license tag to SPDX + +* Thu Jul 21 2022 Fedora Release Engineering - 1.8.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.8.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Parag Nemade - 1.8.0-10 +- Add conditional for anthy module subpackage + +* Tue Jan 26 2021 Fedora Release Engineering - 1.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 30 2019 Mike FABIAN - 1.8.0-5 +- Fix segmentation fault when using ibus-m17n with vi-telex in gedit in Gnome Wayland +- Resolves: rhbz#1704156 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Nov 26 2018 Parag Nemade - 1.8.0-3 +- Added Provides: bundled(gnulib) + +* Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Sat Feb 10 2018 Parag Nemade - 1.8.0-1 - Update to 1.8.0 version (#1543670) diff --git a/sources b/sources index 9fbb7b6..eb1e9ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.0.tar.gz) = 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd +SHA512 (m17n-lib-1.8.4.tar.gz) = 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6 diff --git a/tests/smoke/hello.txt b/tests/smoke/hello.txt deleted file mode 100644 index 6f6082a..0000000 --- a/tests/smoke/hello.txt +++ /dev/null @@ -1,15 +0,0 @@ -hallo -እው ሰላም ነው -مرحبا -হ্যালো -你好 -Ciao -こんにちは -नमस्कार -ਸਤ ਸ੍ਰੀ ਅਕਾਲ -Привет -හෙලෝ -வணக்கம் -สวัสดี -ہیلو -xin chào diff --git a/tests/smoke/old.png b/tests/smoke/old.png deleted file mode 100644 index 7111cfdbe5bb09b5966175fedbd83ad434dd163c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7753 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