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 7111cfd..0000000 Binary files a/tests/smoke/old.png and /dev/null differ diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh deleted file mode 100644 index 1b982f5..0000000 --- a/tests/smoke/runtest.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# If one of the commands below returns non-zero then exit immediately -set -e - -echo "Testing m17n-dump tool" -old_size=`stat -c "%s" old.png` -echo "old_size is $old_size" - -m17n-dump hello.txt -new_size=`stat -c "%s" hello.txt.png` -echo "new_size is $new_size" -file old.png hello.txt.png -echo "Using font `fc-match`" - -if [ $old_size -ne $new_size ]; then - echo "m17n-dump generated different png file" -else - echo "m17n-dump generated same png file" -fi diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 43337e6..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-basic - tests: - - smoke - required_packages: - - m17n-lib-tools - - m17n-lib-devel