From 3a64069f011f08cb316b0504112c90bb21126bdc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 09:40:01 +0000
Subject: [PATCH 01/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 7306d11..a64c13a 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -112,6 +112,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Sat Feb 10 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-1
 - Update to 1.8.0 version (#1543670)
 

From be18af57a7fe80fe22f5cb3cdcc363e25a3ab322 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Mon, 26 Nov 2018 19:21:47 +0530
Subject: [PATCH 02/34] Added Provides: bundled(gnulib)

---
 m17n-lib.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index a64c13a..ccc9d02 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -19,6 +19,10 @@ 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
@@ -112,6 +116,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Mon Nov 26 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-3
+- Added Provides: bundled(gnulib)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 08af07f62cb5faa5318067d22d15e416c9bfd053 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 22 Jan 2019 18:40:21 +0100
Subject: [PATCH 03/34] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 m17n-lib.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index ccc9d02..359d304 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -80,11 +80,9 @@ rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-ispell.so
 
 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

From 4e4eaf48ed8dc92ad7ab4ce78a237f74f35aa3bb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 09:28:03 +0000
Subject: [PATCH 04/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 359d304..9861a54 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -114,6 +114,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Nov 26 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-3
 - Added Provides: bundled(gnulib)
 

From 5d433d6946c2456f6580d98f4c09d7e1463d04e7 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Tue, 30 Apr 2019 10:36:43 +0200
Subject: [PATCH 05/34] Fix segmentation fault when using ibus-m17n with
 vi-telex in gedit in Gnome Wayland

Resolves: rhbz#1704156
---
 ...7n-with-vi-telex-in-gedit-in-wayland.patch | 27 +++++++++++++++++++
 m17n-lib.spec                                 |  9 +++++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch

diff --git a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch b/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
new file mode 100644
index 0000000..3a25ea1
--- /dev/null
+++ b/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
@@ -0,0 +1,27 @@
+From 4d815754f9f32c54ec47f9e323940f6332a7cb5d Mon Sep 17 00:00:00 2001
+From: Mike FABIAN <mfabian@redhat.com>
+Date: Tue, 30 Apr 2019 10:32:13 +0200
+Subject: [PATCH] Fix segmentation fault when using ibus-m17n with vi-telex in
+ gedit in Gnome Wayland
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1704156
+---
+ src/m17n-core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/m17n-core.c b/src/m17n-core.c
+index fe5aa77..642dfee 100644
+--- a/src/m17n-core.c
++++ b/src/m17n-core.c
+@@ -930,6 +930,8 @@ m17n_object_unref (void *object)
+   M17NObjectRecord *record;
+   unsigned *count;
+ 
++  if (object == NULL)
++      return -1;
+   if (! obj->ref_count_extended)
+     {
+       if (! --obj->ref_count)
+-- 
+2.20.1
+
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 9861a54..ee4d119 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,13 +3,14 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
 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
+Patch1:         Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
 
 BuildRequires:  m17n-db-devel libthai-devel
 BuildRequires:  libxml2-devel libXft-devel
@@ -61,7 +62,7 @@ Tools to test M17n GUI widget library.
 
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 #autoreconf -ivf
@@ -114,6 +115,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Tue Apr 30 2019 Mike FABIAN <mfabian@redhat.com> - 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 <releng@fedoraproject.org> - 1.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From b4bdd9688bc4dd3ae6d07e1bf1185586b6b56956 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 15:40:56 +0000
Subject: [PATCH 06/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index ee4d119..556a53b 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -115,6 +115,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Apr 30 2019 Mike FABIAN <mfabian@redhat.com> - 1.8.0-5
 - Fix segmentation fault when using ibus-m17n with vi-telex in gedit in Gnome Wayland
 - Resolves: rhbz#1704156

From 74c09d3142c2f4c86ef376d55b336455a89776f1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 11:49:56 +0000
Subject: [PATCH 07/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 556a53b..0e24c4d 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -115,6 +115,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 84fbe5b31e38fc440546af0d8bf35471ef61bfdc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 06:42:45 +0000
Subject: [PATCH 08/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 0e24c4d..cb2e28c 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -115,6 +115,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 6ecfb58dc4b1059d3f598f0c4638f6c70a20bb2a Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 6 Jan 2021 21:20:37 +0000
Subject: [PATCH 09/34] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 m17n-lib.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index cb2e28c..b930c54 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -12,6 +12,7 @@ Source0:        http://download.savannah.gnu.org/releases/m17n/%{name}-%{version
 Patch0:         %{name}-1.8.0-multilib.patch
 Patch1:         Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
 
+BuildRequires: make
 BuildRequires:  m17n-db-devel libthai-devel
 BuildRequires:  libxml2-devel libXft-devel
 BuildRequires:  fontconfig-devel freetype-devel

From 57e07489c85fc759c21985bfb8adb5e8a324bd8d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 19:05:59 +0000
Subject: [PATCH 10/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index b930c54..7e55853 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -116,6 +116,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From f55d93a40d1b90a7f620736f2c30292dbb85aa54 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Tue, 25 May 2021 14:04:00 +0530
Subject: [PATCH 11/34] Add gating tests

Signed-off-by: Parag Nemade <pnemade@fedoraproject.org>
---
 tests/smoke/hello.txt  |  15 +++++++++++++++
 tests/smoke/old.png    | Bin 0 -> 7753 bytes
 tests/smoke/runtest.sh |  20 ++++++++++++++++++++
 tests/tests.yml        |  11 +++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 tests/smoke/hello.txt
 create mode 100644 tests/smoke/old.png
 create mode 100644 tests/smoke/runtest.sh
 create mode 100644 tests/tests.yml

diff --git a/tests/smoke/hello.txt b/tests/smoke/hello.txt
new file mode 100644
index 0000000..6f6082a
--- /dev/null
+++ b/tests/smoke/hello.txt
@@ -0,0 +1,15 @@
+hallo
+እው ሰላም ነው
+مرحبا
+হ্যালো
+你好
+Ciao
+こんにちは
+नमस्कार
+ਸਤ ਸ੍ਰੀ ਅਕਾਲ
+Привет
+හෙලෝ
+வணக்கம்
+สวัสดี
+ہیلو
+xin chào
diff --git a/tests/smoke/old.png b/tests/smoke/old.png
new file mode 100644
index 0000000000000000000000000000000000000000..7111cfdbe5bb09b5966175fedbd83ad434dd163c
GIT binary patch
literal 7753
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
C(?H4q

literal 0
HcmV?d00001

diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
new file mode 100644
index 0000000..1b982f5
--- /dev/null
+++ b/tests/smoke/runtest.sh
@@ -0,0 +1,20 @@
+#!/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
new file mode 100644
index 0000000..43337e6
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,11 @@
+---
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-basic
+    tests:
+    - smoke
+    required_packages:
+    - m17n-lib-tools
+    - m17n-lib-devel

From 0e0a675ba29dc579d55aac0dc89528957d5b361a Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Fri, 4 Jun 2021 15:37:56 +0530
Subject: [PATCH 12/34] Add conditional for anthy module subpackage

---
 m17n-lib.spec | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 7e55853..446666b 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -1,9 +1,13 @@
 # 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:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -37,13 +41,14 @@ 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}
@@ -80,6 +85,10 @@ make install DESTDIR=%{buildroot} INSTALL="install -p"
 # fix bug rh#680363
 rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-ispell.so
 
+%if %{without anthy}
+rm %{buildroot}%{_libdir}/m17n/1.0/libmimx-anthy.so
+%endif
+
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %ldconfig_scriptlets
@@ -98,8 +107,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-flt.so.*
 
 #Anthy module
+%if %{with anthy}
 %files anthy
 %{_libdir}/m17n/1.0/libmimx-anthy.so
+%endif
 
 %files devel
 %{_includedir}/*
@@ -116,6 +127,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Fri Jun 04 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-10
+- Add conditional for anthy module subpackage
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 07f20bc5900aecba1acdcaf9306798be3ab3ef7c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 13:35:20 +0000
Subject: [PATCH 13/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 446666b..944beeb 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -127,6 +127,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri Jun 04 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-10
 - Add conditional for anthy module subpackage
 

From a83bb4cdff667b0046a79d8212ac3159810e8c9c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 18:31:55 +0000
Subject: [PATCH 14/34] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 944beeb..5163946 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -127,6 +127,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From c7bb2ba9010736dfc71d5759115fbdb91926b367 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 20:20:31 +0000
Subject: [PATCH 15/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 5163946..e82680e 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPLv2+
@@ -127,6 +127,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 0f5ca7c163b85dd0087329072e7faecf36aad7a3 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Wed, 30 Nov 2022 15:15:13 +0100
Subject: [PATCH 16/34] Migrate license tag to SPDX

---
 m17n-lib.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index e82680e..22b4ff7 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,10 +7,10 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        13%{?dist}
+Release:        14%{?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
@@ -127,6 +127,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Wed Nov 30 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.0-14
+- Migrate license tag to SPDX
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 87605f31506689fb344376f92f1659192c5dcc20 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 18:46:43 +0000
Subject: [PATCH 17/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 22b4ff7..2b18554 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -127,6 +127,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Nov 30 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.0-14
 - Migrate license tag to SPDX
 

From 6735ce8eab3e1c8e918c1f787ae2a5ed21ec240f Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 25 Apr 2023 12:17:20 +0200
Subject: [PATCH 18/34] Fix C99 compatibility issue in example code

Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
---
 m17n-lib-c99.patch | 15 +++++++++++++++
 m17n-lib.spec      |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 m17n-lib-c99.patch

diff --git a/m17n-lib-c99.patch b/m17n-lib-c99.patch
new file mode 100644
index 0000000..d8158c9
--- /dev/null
+++ b/m17n-lib-c99.patch
@@ -0,0 +1,15 @@
+Submitted upstream: <https://savannah.nongnu.org/bugs/index.php?64106>
+
+diff --git a/example/medit.c b/example/medit.c
+index e6a6dc8c108fe44f..f2b109db3e0e2b81 100644
+--- a/example/medit.c
++++ b/example/medit.c
+@@ -662,7 +662,7 @@ static void MenuHelpProc (Widget, XEvent *, String *, Cardinal *);
+    off the current input method, otherwide turn on the input method
+    input_method_table[$IDX].  */
+ void
+-select_input_method (idx)
++select_input_method (int idx)
+ {
+   int previous_input_method = current_input_method;
+ 
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 2b18554..d5d712a 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -15,6 +15,7 @@ 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
 Patch1:         Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
+Patch2: m17n-lib-c99.patch
 
 BuildRequires: make
 BuildRequires:  m17n-db-devel libthai-devel
@@ -127,6 +128,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Tue Apr 25 2023 Florian Weimer <fweimer@redhat.com> - 1.8.0-16
+- Fix C99 compatibility issue in example code
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 9584f253e109626f399be8716a665e6e096ad5e7 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Thu, 4 May 2023 15:23:18 +0200
Subject: [PATCH 19/34] 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)
---
 .gitignore                                    |  1 +
 ...7n-with-vi-telex-in-gedit-in-wayland.patch | 27 -------------------
 m17n-lib-c99.patch                            | 15 -----------
 m17n-lib.spec                                 | 12 ++++++---
 sources                                       |  2 +-
 5 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100644 Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
 delete mode 100644 m17n-lib-c99.patch

diff --git a/.gitignore b/.gitignore
index 742086d..675c07f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ m17n-lib-1.6.1.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.1.tar.gz
diff --git a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch b/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
deleted file mode 100644
index 3a25ea1..0000000
--- a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4d815754f9f32c54ec47f9e323940f6332a7cb5d Mon Sep 17 00:00:00 2001
-From: Mike FABIAN <mfabian@redhat.com>
-Date: Tue, 30 Apr 2019 10:32:13 +0200
-Subject: [PATCH] Fix segmentation fault when using ibus-m17n with vi-telex in
- gedit in Gnome Wayland
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1704156
----
- src/m17n-core.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/m17n-core.c b/src/m17n-core.c
-index fe5aa77..642dfee 100644
---- a/src/m17n-core.c
-+++ b/src/m17n-core.c
-@@ -930,6 +930,8 @@ m17n_object_unref (void *object)
-   M17NObjectRecord *record;
-   unsigned *count;
- 
-+  if (object == NULL)
-+      return -1;
-   if (! obj->ref_count_extended)
-     {
-       if (! --obj->ref_count)
--- 
-2.20.1
-
diff --git a/m17n-lib-c99.patch b/m17n-lib-c99.patch
deleted file mode 100644
index d8158c9..0000000
--- a/m17n-lib-c99.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Submitted upstream: <https://savannah.nongnu.org/bugs/index.php?64106>
-
-diff --git a/example/medit.c b/example/medit.c
-index e6a6dc8c108fe44f..f2b109db3e0e2b81 100644
---- a/example/medit.c
-+++ b/example/medit.c
-@@ -662,7 +662,7 @@ static void MenuHelpProc (Widget, XEvent *, String *, Cardinal *);
-    off the current input method, otherwide turn on the input method
-    input_method_table[$IDX].  */
- void
--select_input_method (idx)
-+select_input_method (int idx)
- {
-   int previous_input_method = current_input_method;
- 
diff --git a/m17n-lib.spec b/m17n-lib.spec
index d5d712a..edc65f6 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -6,16 +6,14 @@
 %endif
 
 Name:           m17n-lib
-Version:        1.8.0
-Release:        16%{?dist}
+Version:        1.8.1
+Release:        11%{?dist}
 Summary:        Multilingual text library
 
 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
-Patch1:         Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch
-Patch2: m17n-lib-c99.patch
 
 BuildRequires: make
 BuildRequires:  m17n-db-devel libthai-devel
@@ -128,6 +126,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Fri May 05 2023 Mike FABIAN <mfabian@redhat.com> - 1.8.1-1
+- 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 <fweimer@redhat.com> - 1.8.0-16
 - Fix C99 compatibility issue in example code
 
diff --git a/sources b/sources
index 9fbb7b6..d99b92e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (m17n-lib-1.8.0.tar.gz) = 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
+SHA512 (m17n-lib-1.8.1.tar.gz) = d8b97c0145ac9056b962c4ef6204bd9f1766487393def8b31d984199003ba984eb1312b84e2c74261cafee493c370c1676e79dbd850a77bbfb3392f4cd9db437

From cd5305a956f7df8d3db73998b12bb882488451e3 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Tue, 9 May 2023 20:00:46 +0200
Subject: [PATCH 20/34] 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
---
 .gitignore    |  1 +
 m17n-lib.spec | 14 +++++++++-----
 sources       |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 675c07f..1cf883c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ m17n-lib-1.6.1.tar.gz
 /m17n-lib-1.8.0RC.tar.gz
 /m17n-lib-1.8.0.tar.gz
 /m17n-lib-1.8.1.tar.gz
+/m17n-lib-1.8.2.tar.gz
diff --git a/m17n-lib.spec b/m17n-lib.spec
index edc65f6..dc113c5 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           m17n-lib
-Version:        1.8.1
-Release:        11%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -75,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"
@@ -126,7 +125,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
-* Fri May 05 2023 Mike FABIAN <mfabian@redhat.com> - 1.8.1-1
+* Tue May 09 2023 Mike FABIAN <mfabian@redhat.com> - 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
diff --git a/sources b/sources
index d99b92e..51dfdc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (m17n-lib-1.8.1.tar.gz) = d8b97c0145ac9056b962c4ef6204bd9f1766487393def8b31d984199003ba984eb1312b84e2c74261cafee493c370c1676e79dbd850a77bbfb3392f4cd9db437
+SHA512 (m17n-lib-1.8.2.tar.gz) = 715aae4ba64399021c5f29ae35af0ce872eaee23cd70a94726692e6cf9e591e9e6195cce305ad58c12aab756beb257113150e2adfb1e203b91ef3a06ac3424d0

From be93fcf175a4c8d77f7bf14d47270419b4d16a95 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 13:33:20 +0000
Subject: [PATCH 21/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index dc113c5..308b3bd 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -125,6 +125,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue May 09 2023 Mike FABIAN <mfabian@redhat.com> - 1.8.2-1
 - Update to 1.8.2
 - Fix parallel builds by switching from absolute to relative paths

From d012b71aeb70b53c910d094810dcebc729078875 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Tue, 25 Jul 2023 10:44:59 +0200
Subject: [PATCH 22/34] Update to 1.8.3

---
 .gitignore    | 1 +
 m17n-lib.spec | 8 ++++++--
 sources       | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1cf883c..392e33d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ m17n-lib-1.6.1.tar.gz
 /m17n-lib-1.8.0.tar.gz
 /m17n-lib-1.8.1.tar.gz
 /m17n-lib-1.8.2.tar.gz
+/m17n-lib-1.8.3.tar.gz
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 308b3bd..cadf49b 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           m17n-lib
-Version:        1.8.2
-Release:        2%{?dist}
+Version:        1.8.3
+Release:        1%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -125,6 +125,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Tue Jul 25 2023 Mike FABIAN <mfabian@redhat.com> - 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 <releng@fedoraproject.org> - 1.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 51dfdc6..edead21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (m17n-lib-1.8.2.tar.gz) = 715aae4ba64399021c5f29ae35af0ce872eaee23cd70a94726692e6cf9e591e9e6195cce305ad58c12aab756beb257113150e2adfb1e203b91ef3a06ac3424d0
+SHA512 (m17n-lib-1.8.3.tar.gz) = 3f162fded40b3c84fc112c265ebda7a11cf8c4010ec3506a3b20c5f014210914068d47e5338862e86e4d978ef89c6d09938ecf92b0e71a95f29a5f3681dd28b6

From 2b4a45fc87b5d2a7bb7997af05c685d95ac94036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 26 Jul 2023 09:40:31 +0200
Subject: [PATCH 23/34] Rebuild(libotf)

---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index cadf49b..4c65b00 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -125,6 +125,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Wed Jul 26 2023 Björn Esser <besser82@fedoraproject.org> - 1.8.3-2
+- Rebuild(libotf)
+
 * Tue Jul 25 2023 Mike FABIAN <mfabian@redhat.com> - 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

From 432d9711e8c7eaab98268ffed0b5d02b8611ed6c Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Wed, 23 Aug 2023 10:31:44 +0200
Subject: [PATCH 24/34] Update to 1.8.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixes “typedef in m17n-core.h causing error when compiling with C++ code”
  (Resolves: https://savannah.nongnu.org/bugs/index.php?64566)
---
 .gitignore    | 1 +
 m17n-lib.spec | 9 +++++++--
 sources       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 392e33d..86a0170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ m17n-lib-1.6.1.tar.gz
 /m17n-lib-1.8.1.tar.gz
 /m17n-lib-1.8.2.tar.gz
 /m17n-lib-1.8.3.tar.gz
+/m17n-lib-1.8.4.tar.gz
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 4c65b00..f43bf72 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           m17n-lib
-Version:        1.8.3
-Release:        2%{?dist}
+Version:        1.8.4
+Release:        1%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -125,6 +125,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Wed Aug 23 2023 Mike FABIAN <mfabian@redhat.com> - 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 <besser82@fedoraproject.org> - 1.8.3-2
 - Rebuild(libotf)
 
diff --git a/sources b/sources
index edead21..eb1e9ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (m17n-lib-1.8.3.tar.gz) = 3f162fded40b3c84fc112c265ebda7a11cf8c4010ec3506a3b20c5f014210914068d47e5338862e86e4d978ef89c6d09938ecf92b0e71a95f29a5f3681dd28b6
+SHA512 (m17n-lib-1.8.4.tar.gz) = 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6

From 5d8dab9efa9e9e513e3b84c94130bafc5f196cb5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 06:43:00 +0000
Subject: [PATCH 25/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index f43bf72..2f5ed93 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -125,6 +125,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Aug 23 2023 Mike FABIAN <mfabian@redhat.com> - 1.8.4-1
 - Update to 1.8.4
 - Fixes “typedef in m17n-core.h causing error when compiling with C++ code”

From b750709b2aca90f4f1d504077fc11e64d8514d83 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 05:34:12 +0000
Subject: [PATCH 26/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 m17n-lib.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/m17n-lib.spec b/m17n-lib.spec
index 2f5ed93..5d4b20f 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -125,6 +125,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 47f97c458df52ccf6ad4d0279390469082dc6804 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Thu, 18 Jul 2024 10:56:00 +0200
Subject: [PATCH 27/34] Convert to rpm-autospec

---
 changelog     | 280 +++++++++++++++++++++++++++++++++++++++++++++++++
 m17n-lib.spec | 283 +-------------------------------------------------
 2 files changed, 282 insertions(+), 281 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..c27694a
--- /dev/null
+++ b/changelog
@@ -0,0 +1,280 @@
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Aug 23 2023 Mike FABIAN <mfabian@redhat.com> - 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 <besser82@fedoraproject.org> - 1.8.3-2
+- Rebuild(libotf)
+
+* Tue Jul 25 2023 Mike FABIAN <mfabian@redhat.com> - 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 <releng@fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue May 09 2023 Mike FABIAN <mfabian@redhat.com> - 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 <fweimer@redhat.com> - 1.8.0-16
+- Fix C99 compatibility issue in example code
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Nov 30 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.0-14
+- Migrate license tag to SPDX
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-10
+- Add conditional for anthy module subpackage
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Apr 30 2019 Mike FABIAN <mfabian@redhat.com> - 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 <releng@fedoraproject.org> - 1.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Nov 26 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-3
+- Added Provides: bundled(gnulib)
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Feb 10 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-1
+- Update to 1.8.0 version (#1543670)
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.2.RC1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jan 03 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-0.1.RC1
+- Update to 1.8.0 (#1523968)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Aug 26 2015 Mike FABIAN <mfabian@redhat.com> - 1.7.0-4
+- Fix "Transliteration not working on Marathi language" (it crashed).
+- Resolves: rhbz#1256244
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.7.0-2
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Mon Dec 22 2014 Parag Nemade <pnemade AT redhat DOT com> - 1.7.0-1
+- update to 1.7.0
+- Drop aarch64 patch and use autoreconf
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Thu Aug 07 2014 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-12
+- Resolves:rh#1127583 - Add missing BuildRequires
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jun 11 2013 Remi Collet <rcollet@redhat.com> - 1.6.4-9
+- rebuild for new GD 2.1.0
+
+* Sun Mar 24 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-8
+- Resolves:rh#926108 - Does not support aarch64 in f19 and rawhide
+
+* Thu Mar 14 2013 Hans de Goede <hdegoede@redhat.com> - 1.6.4-7
+- Fix m17n-config not working on non x86_* archs (rh#921189)
+
+* Mon Mar 11 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-6
+- Resolves:rh#907488 - shell syntax error in m17n-config
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Nov 30 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-4
+- Resolves:rh#880957 - m17n-lib doesn't uninstall properly
+
+* Tue Nov 20 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-3
+- m17n-lib to own %%{_libdir}/m17n
+
+* Tue Nov 20 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-2
+- Resolves:rh#877925 - drop m17n-lib-flt provides
+- Fix bogus date in %%changelog
+- Make sure not to attempt to use parallel make as it fails the build
+
+* Tue Sep 18 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-1
+- update to 1.6.4
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Oct 11 2011 Parag Nemade <pnemade AT redhat DOT com> - 1.6.3-1
+- update to 1.6.3
+
+* Tue Mar 22 2011 Parag Nemade <pnemade AT redhat DOT com> - 1.6.2-3
+- Resolves: rh#680363 - Remove m17n-lib-ispell subpackage
+- Resolves: rh#677866 - m17n*.pc reports wrong moduledir on x86_64 system
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Oct 06 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.2-1
+- update to new upstream release 1.6.2
+
+* Mon Sep 13 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.1-5
+- Fix some packaging issue
+- Change Requires: m17n-db-datafiles to m17n-db-extras
+
+* Fri Sep 10 2010 Daiki Ueno <dueno@redhat.com> - 1.6.1-4
+- supply libotf cflags/libs manually, since the current libotf package
+  does not ship with "libotf-config" and m17n-lib cannot detect those
+  values
+- fix paths for modules used by GUI support
+
+* Wed Aug 11 2010 Adam Jackson <ajax@redhat.com> 1.6.1-3
+- Fix Obsoletes: so upgrades actually work (1.5.5-3 < 1.5.5-3.fc13)
+
+* Wed Jul 07 2010 Parag Nemade <pnemade@redhat.com> - 1.6.1-2
+- Resolves: rh#602029:-m17n-lib-devel multilib conflict 
+- Fix rpmlint rpath error.
+
+* Tue Apr 27 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.1-1
+- update to new upstream release 1.6.1
+
+* Wed Apr 07 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.0-1
+- update to new upstream release 1.6.0
+
+* Wed Dec 23 2009 Jens Petersen <petersen@redhat.com> - 1.5.5-2
+- add bcond for otf, anthy, and gui
+- subpackage flt for emacs, etc
+- add subpackages for anthy and ispell modules
+- disable new gui subpackage (and hence ispell)
+
+* Mon Aug 17 2009 Parag Nemade <pnemade@redhat.com> - 1.5.5-1
+- update to new upstream release 1.5.5
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Mar 03 2009 Parag Nemade <pnemade@redhat.com> -1.5.4-1
+- Update to new upstream release 1.5.4
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Oct 21 2008 Parag Nemade <pnemade@redhat.com> -1.5.3-1.fc10
+- Update to new upstream release 1.5.3
+
+* Thu Jul 03 2008 Parag Nemade <pnemade@redhat.com> -1.5.2-1
+- Update to new upstream release 1.5.2
+
+* Thu Feb 07 2008 Parag Nemade <pnemade@redhat.com> -1.5.1-1.fc9
+- Update to new upstream release 1.5.1
+
+* Fri Dec 28 2007 Parag Nemade <pnemade@redhat.com> -1.5.0-1.fc9
+- Update to new upstream release 1.5.0
+- Added missing internal-flt.h file as Source1
+
+* Wed Aug 22 2007 Parag Nemade <pnemade@redhat.com> - 1.4.0-2
+- rebuild against new rpm package
+- update license tag
+
+* Thu Jul 19 2007 Jens Petersen <petersen@redhat.com>
+- buildrequire and require m17n-db >= 1.4.0
+
+* Thu Jul 19 2007 Parag Nemade <pnemade@redhat.com> - 1.4.0-1
+- Updated to new upstream release 1.4.0
+
+* Wed Jan 10 2007 Mayank Jain <majain@redhat.com> - 1.3.4-1.1.fc7
+- rebuild for m17n-lib-1.3.4 version
+- Updated m17n-lib-nobuild-examples.patch
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.3.3-1.1.fc6
+- rebuild
+
+* Wed Jul 12 2006 Mayank Jain <majain@redhat.com> - 1.3.3-1.fc6
+- Updated spec file for changes mentioned in RH bug 193524, comment 4
+- Thanks to Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+
+* Thu Mar  2 2006 Jens Petersen <petersen@redhat.com> - 1.3.3-1
+- update to 1.3.3 minor bugfix release
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.3.2-1.1
+- bump again for double-long bug on ppc(64)
+
+* Fri Feb 10 2006 Jens Petersen <petersen@redhat.com> - 1.3.2-1
+- update to 1.3.2 bugfix release
+  - m17n-lib-no-gui-headers.patch is now upstream
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.3.1-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Thu Feb  2 2006 Jens Petersen <petersen@redhat.com> - 1.3.1-1
+- update to 1.3.1 release
+  - rename use_otf and use_anthy macros to with_gui and with_examples
+  - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch
+    with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch
+
+* Fri Dec 16 2005 Jens Petersen <petersen@redhat.com> - 1.2.0-2
+- import to Fedora Core
+- buildrequire autoconf
+
+* Thu Nov 10 2005 Jens Petersen <petersen@redhat.com> - 1.2.0-1
+- do not build static lib and .la files (Warren Togami)
+
+* Wed Oct  5 2005 Jens Petersen <petersen@redhat.com>
+- initial packaging for Fedora Extras
+
+* Sat Jan 15 2005 UTUMI Hirosi <utuhiro78@yahoo.co.jp>
+- modify spec for fedora
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 5d4b20f..7754ca5 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -7,7 +7,7 @@
 
 Name:           m17n-lib
 Version:        1.8.4
-Release:        3%{?dist}
+Release:        %autorelease
 Summary:        Multilingual text library
 
 License:        LGPL-2.1-or-later
@@ -125,283 +125,4 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Aug 23 2023 Mike FABIAN <mfabian@redhat.com> - 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 <besser82@fedoraproject.org> - 1.8.3-2
-- Rebuild(libotf)
-
-* Tue Jul 25 2023 Mike FABIAN <mfabian@redhat.com> - 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 <releng@fedoraproject.org> - 1.8.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 09 2023 Mike FABIAN <mfabian@redhat.com> - 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 <fweimer@redhat.com> - 1.8.0-16
-- Fix C99 compatibility issue in example code
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Nov 30 2022 Mike FABIAN <mfabian@redhat.com> - 1.8.0-14
-- Migrate license tag to SPDX
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-10
-- Add conditional for anthy module subpackage
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Apr 30 2019 Mike FABIAN <mfabian@redhat.com> - 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 <releng@fedoraproject.org> - 1.8.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Nov 26 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-3
-- Added Provides: bundled(gnulib)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Feb 10 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-1
-- Update to 1.8.0 version (#1543670)
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-0.2.RC1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jan 03 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-0.1.RC1
-- Update to 1.8.0 (#1523968)
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Aug 26 2015 Mike FABIAN <mfabian@redhat.com> - 1.7.0-4
-- Fix "Transliteration not working on Marathi language" (it crashed).
-- Resolves: rhbz#1256244
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.7.0-2
-- Rebuilt for Fedora 23 Change
-  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
-
-* Mon Dec 22 2014 Parag Nemade <pnemade AT redhat DOT com> - 1.7.0-1
-- update to 1.7.0
-- Drop aarch64 patch and use autoreconf
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Aug 07 2014 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-12
-- Resolves:rh#1127583 - Add missing BuildRequires
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue Jun 11 2013 Remi Collet <rcollet@redhat.com> - 1.6.4-9
-- rebuild for new GD 2.1.0
-
-* Sun Mar 24 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-8
-- Resolves:rh#926108 - Does not support aarch64 in f19 and rawhide
-
-* Thu Mar 14 2013 Hans de Goede <hdegoede@redhat.com> - 1.6.4-7
-- Fix m17n-config not working on non x86_* archs (rh#921189)
-
-* Mon Mar 11 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-6
-- Resolves:rh#907488 - shell syntax error in m17n-config
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Nov 30 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-4
-- Resolves:rh#880957 - m17n-lib doesn't uninstall properly
-
-* Tue Nov 20 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-3
-- m17n-lib to own %%{_libdir}/m17n
-
-* Tue Nov 20 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-2
-- Resolves:rh#877925 - drop m17n-lib-flt provides
-- Fix bogus date in %%changelog
-- Make sure not to attempt to use parallel make as it fails the build
-
-* Tue Sep 18 2012 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-1
-- update to 1.6.4
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Oct 11 2011 Parag Nemade <pnemade AT redhat DOT com> - 1.6.3-1
-- update to 1.6.3
-
-* Tue Mar 22 2011 Parag Nemade <pnemade AT redhat DOT com> - 1.6.2-3
-- Resolves: rh#680363 - Remove m17n-lib-ispell subpackage
-- Resolves: rh#677866 - m17n*.pc reports wrong moduledir on x86_64 system
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Oct 06 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.2-1
-- update to new upstream release 1.6.2
-
-* Mon Sep 13 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.1-5
-- Fix some packaging issue
-- Change Requires: m17n-db-datafiles to m17n-db-extras
-
-* Fri Sep 10 2010 Daiki Ueno <dueno@redhat.com> - 1.6.1-4
-- supply libotf cflags/libs manually, since the current libotf package
-  does not ship with "libotf-config" and m17n-lib cannot detect those
-  values
-- fix paths for modules used by GUI support
-
-* Wed Aug 11 2010 Adam Jackson <ajax@redhat.com> 1.6.1-3
-- Fix Obsoletes: so upgrades actually work (1.5.5-3 < 1.5.5-3.fc13)
-
-* Wed Jul 07 2010 Parag Nemade <pnemade@redhat.com> - 1.6.1-2
-- Resolves: rh#602029:-m17n-lib-devel multilib conflict 
-- Fix rpmlint rpath error.
-
-* Tue Apr 27 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.1-1
-- update to new upstream release 1.6.1
-
-* Wed Apr 07 2010 Parag Nemade <pnemade AT redhat.com> - 1.6.0-1
-- update to new upstream release 1.6.0
-
-* Wed Dec 23 2009 Jens Petersen <petersen@redhat.com> - 1.5.5-2
-- add bcond for otf, anthy, and gui
-- subpackage flt for emacs, etc
-- add subpackages for anthy and ispell modules
-- disable new gui subpackage (and hence ispell)
-
-* Mon Aug 17 2009 Parag Nemade <pnemade@redhat.com> - 1.5.5-1
-- update to new upstream release 1.5.5
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Mar 03 2009 Parag Nemade <pnemade@redhat.com> -1.5.4-1
-- Update to new upstream release 1.5.4
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Oct 21 2008 Parag Nemade <pnemade@redhat.com> -1.5.3-1.fc10
-- Update to new upstream release 1.5.3
-
-* Thu Jul 03 2008 Parag Nemade <pnemade@redhat.com> -1.5.2-1
-- Update to new upstream release 1.5.2
-
-* Thu Feb 07 2008 Parag Nemade <pnemade@redhat.com> -1.5.1-1.fc9
-- Update to new upstream release 1.5.1
-
-* Fri Dec 28 2007 Parag Nemade <pnemade@redhat.com> -1.5.0-1.fc9
-- Update to new upstream release 1.5.0
-- Added missing internal-flt.h file as Source1
-
-* Wed Aug 22 2007 Parag Nemade <pnemade@redhat.com> - 1.4.0-2
-- rebuild against new rpm package
-- update license tag
-
-* Thu Jul 19 2007 Jens Petersen <petersen@redhat.com>
-- buildrequire and require m17n-db >= 1.4.0
-
-* Thu Jul 19 2007 Parag Nemade <pnemade@redhat.com> - 1.4.0-1
-- Updated to new upstream release 1.4.0
-
-* Wed Jan 10 2007 Mayank Jain <majain@redhat.com> - 1.3.4-1.1.fc7
-- rebuild for m17n-lib-1.3.4 version
-- Updated m17n-lib-nobuild-examples.patch
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.3.3-1.1.fc6
-- rebuild
-
-* Wed Jul 12 2006 Mayank Jain <majain@redhat.com> - 1.3.3-1.fc6
-- Updated spec file for changes mentioned in RH bug 193524, comment 4
-- Thanks to Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-
-* Thu Mar  2 2006 Jens Petersen <petersen@redhat.com> - 1.3.3-1
-- update to 1.3.3 minor bugfix release
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.3.2-1.1
-- bump again for double-long bug on ppc(64)
-
-* Fri Feb 10 2006 Jens Petersen <petersen@redhat.com> - 1.3.2-1
-- update to 1.3.2 bugfix release
-  - m17n-lib-no-gui-headers.patch is now upstream
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.3.1-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Feb  2 2006 Jens Petersen <petersen@redhat.com> - 1.3.1-1
-- update to 1.3.1 release
-  - rename use_otf and use_anthy macros to with_gui and with_examples
-  - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch
-    with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch
-
-* Fri Dec 16 2005 Jens Petersen <petersen@redhat.com> - 1.2.0-2
-- import to Fedora Core
-- buildrequire autoconf
-
-* Thu Nov 10 2005 Jens Petersen <petersen@redhat.com> - 1.2.0-1
-- do not build static lib and .la files (Warren Togami)
-
-* Wed Oct  5 2005 Jens Petersen <petersen@redhat.com>
-- initial packaging for Fedora Extras
-
-* Sat Jan 15 2005 UTUMI Hirosi <utuhiro78@yahoo.co.jp>
-- modify spec for fedora
+%autochangelog

From 4c29553301a3de7ee0ed4a04d7e983be81c0ad50 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Thu, 18 Jul 2024 11:00:57 +0200
Subject: [PATCH 28/34] Convert CI test to tmt

---
 .fmf/version                |   1 +
 plans/basic.fmf             |   5 +++
 tests/{smoke => }/hello.txt |   0
 tests/main.fmf              |  15 +++++++++
 tests/{smoke => }/old.png   | Bin
 tests/runtest.sh            |  60 ++++++++++++++++++++++++++++++++++++
 tests/smoke/runtest.sh      |  20 ------------
 tests/tests.yml             |  11 -------
 8 files changed, 81 insertions(+), 31 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/basic.fmf
 rename tests/{smoke => }/hello.txt (100%)
 create mode 100644 tests/main.fmf
 rename tests/{smoke => }/old.png (100%)
 create mode 100755 tests/runtest.sh
 delete mode 100644 tests/smoke/runtest.sh
 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..c1627f9
--- /dev/null
+++ b/plans/basic.fmf
@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/tests/smoke/hello.txt b/tests/hello.txt
similarity index 100%
rename from tests/smoke/hello.txt
rename to tests/hello.txt
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 0000000..f5d562e
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1,15 @@
+test: ./runtest.sh
+duration: 10m
+framework: beakerlib
+require:
+  - m17n-lib
+  - m17n-lib-devel
+  - m17n-lib-tools
+  - glibc-locale-source
+  - rpm-build
+  - autoconf
+  - automake
+  - libtool
+  - make
+  - gettext-devel
+  - gcc
diff --git a/tests/smoke/old.png b/tests/old.png
similarity index 100%
rename from tests/smoke/old.png
rename to tests/old.png
diff --git a/tests/runtest.sh b/tests/runtest.sh
new file mode 100755
index 0000000..8032650
--- /dev/null
+++ b/tests/runtest.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+NAME=m17n-lib
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm ${NAME}
+        rlAssertRpm ${NAME}-devel
+        rlAssertRpm glibc-locale-source
+        rlShowPackageVersion ${NAME}
+        rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION"
+        FEDORA_VERSION=$(rlGetDistroRelease)
+        rlLog "FEDORA_VERSION=${DISTRO_RELEASE}"
+        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
+        rlRun "cp hello.txt old.png $tmp" 0 "Copy files needed for tests"
+        rlRun "pushd $tmp"
+        rlFetchSrcForInstalled "${NAME}"
+        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/${NAME}-${VERSION}-build ]; then
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}"
+        else
+            rlRun -t -l "pushd BUILD/${NAME}-${VERSION}"
+        fi
+        rlRun "set -o pipefail"
+        rlRun -t -l "./bootstrap.sh"
+        rlRun -t -l "./configure --prefix=/usr"
+        rlRun -t -l "make check"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "pushd $tmp"
+        rlGetTestState
+        rlLog "Number of failed asserts so far: ${ECODE}"
+        rlRun -t -l "OLD_SIZE=$(stat -c \"%s\" old.png)" \
+              0 "Get size of old.png"
+        rlLog "Old size is ${OLD_SIZE}"
+        rlRun -t -l "m17n-dump hello.txt" \
+              0 "Create a new png"
+        rlFileSubmit hello.txt.png
+        rlRun -t -l "NEW_SIZE=$(stat -c \"%s\" hello.txt.png)" \
+              0 "Get size of hello.txt.png"
+        rlLog "New size is ${NEW_SIZE}"
+        rlRun -t -l "file old.png hello.txt.png" \
+              0 "Log output of file command"
+        rlRun -t -l "echo $(fc-match)" \
+              0 "Show which font was used"
+        rlAssertGreater "New size should be greater than 1000" ${NEW_SIZE} 1000
+        rlGetTestState
+        rlLog "Number of failed asserts so far: ${ECODE}"
+        rlRun "popd" 0
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $tmp" 0 "Remove tmp directory"
+    rlPhaseEnd
+rlJournalEnd
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

From 64904c31f5ca66d94eed978e0d41cf967b3eb320 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 16:32:08 +0000
Subject: [PATCH 29/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 1cee685bd75e70acec5f08d2a207eab49f790e9f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 16:39:20 +0000
Subject: [PATCH 30/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From aeed128a117388dacf22ed9b07ee2a61f1d015ab Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Wed, 22 Jan 2025 11:39:22 +0100
Subject: [PATCH 31/34] Fix build on rawhide (F42)

---
 m17n-lib-1.8.4-fix-build.patch | 12 ++++++++++++
 m17n-lib.spec                  |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 m17n-lib-1.8.4-fix-build.patch

diff --git a/m17n-lib-1.8.4-fix-build.patch b/m17n-lib-1.8.4-fix-build.patch
new file mode 100644
index 0000000..2c63a6b
--- /dev/null
+++ b/m17n-lib-1.8.4-fix-build.patch
@@ -0,0 +1,12 @@
+diff -ru m17n-lib-1.8.4.orig/example/medit.c m17n-lib-1.8.4/example/medit.c
+--- m17n-lib-1.8.4.orig/example/medit.c	2023-06-29 15:51:21.000000000 +0200
++++ m17n-lib-1.8.4/example/medit.c	2025-01-22 11:33:48.713029732 +0100
+@@ -1861,7 +1861,7 @@
+ }
+ 
+ MText *
+-read_file ()
++read_file (const char *filename)
+ {
+   FILE *fp = fopen (filename, "r");
+ 
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 7754ca5..4a86817 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -14,6 +14,7 @@ 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
+Patch1:         %{name}-1.8.4-fix-build.patch
 
 BuildRequires: make
 BuildRequires:  m17n-db-devel libthai-devel

From 0a384be7ba1c10d93d02259295e0f674b3cccbf1 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Sun, 9 Feb 2025 22:43:28 +0100
Subject: [PATCH 32/34] Update to 1.8.5

- Use UTF-8 instead of EUC-JP in example/mimx-anthy.c
  This fixes encoding problems when ja-anthy is used by ibus-m17n
  (m17n:ja:anthy - ja-anthy (m17n)) or by ibus-typing-booster.
- Enable anthy-unicode (thanks to Takao Fujiwara <tfujiwar@redhat.com>)
- Fix build on Fedora rawhide (Fedora 42)
  (Now included in upstream tarball, remove patch)
- configure.ac: fix incorrect bashism (thanks to Eli Schwartz <eschwartz93@gmail.com>)
---
 .gitignore                     |  1 +
 m17n-lib-1.8.4-fix-build.patch | 12 ------------
 m17n-lib.spec                  |  5 ++---
 sources                        |  2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 m17n-lib-1.8.4-fix-build.patch

diff --git a/.gitignore b/.gitignore
index 86a0170..9bc4420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ m17n-lib-1.6.1.tar.gz
 /m17n-lib-1.8.2.tar.gz
 /m17n-lib-1.8.3.tar.gz
 /m17n-lib-1.8.4.tar.gz
+/m17n-lib-1.8.5.tar.gz
diff --git a/m17n-lib-1.8.4-fix-build.patch b/m17n-lib-1.8.4-fix-build.patch
deleted file mode 100644
index 2c63a6b..0000000
--- a/m17n-lib-1.8.4-fix-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru m17n-lib-1.8.4.orig/example/medit.c m17n-lib-1.8.4/example/medit.c
---- m17n-lib-1.8.4.orig/example/medit.c	2023-06-29 15:51:21.000000000 +0200
-+++ m17n-lib-1.8.4/example/medit.c	2025-01-22 11:33:48.713029732 +0100
-@@ -1861,7 +1861,7 @@
- }
- 
- MText *
--read_file ()
-+read_file (const char *filename)
- {
-   FILE *fp = fopen (filename, "r");
- 
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 4a86817..c74e1e2 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name:           m17n-lib
-Version:        1.8.4
+Version:        1.8.5
 Release:        %autorelease
 Summary:        Multilingual text library
 
@@ -14,7 +14,6 @@ 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
-Patch1:         %{name}-1.8.4-fix-build.patch
 
 BuildRequires: make
 BuildRequires:  m17n-db-devel libthai-devel
@@ -30,7 +29,7 @@ BuildRequires:  automake libtool
 Provides: bundled(gnulib)
 
 %if %{with anthy}
-BuildRequires:  anthy-devel
+BuildRequires:  anthy-unicode-devel
 %endif
 
 Requires:       m17n-db
diff --git a/sources b/sources
index eb1e9ea..0005908 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (m17n-lib-1.8.4.tar.gz) = 7e322788aed8a758a8c289112433aabccd12dacf14b247ba9060503bcc44930c9251f0c4e718987b9a151de097e72bc1e07c8096f7f4ad83a7d7183a549721d6
+SHA512 (m17n-lib-1.8.5.tar.gz) = ac343e27df790161d9459bb0ef9827302cad6e1e291a5b245867d4bc93b2aa53faf5feb22af655de3402afda0665ac1d0ed0b765bd48c6bd458cea15dc325fc3

From 8e2fbedce473160492817555e48e0f5b18867113 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Tue, 3 Jun 2025 16:05:00 +0200
Subject: [PATCH 33/34] Update to 1.8.6

- Add m17n-input-test program
  (by David Mandelberg <david@mandelberg.org>)
- input.c (regularize_action): Do not update the element of action_list
  if the element is a symbol that is defined as a variable
  (By K. Handa <handa@gnu.org>).
- Increment buffer index correctly in read_mtext_element ()
  (Resolves: https://savannah.nongnu.org/bugs/index.php?67107)
  (by David Mandelberg <david@mandelberg.org>)
- Simplify configure check for anthy/anthy-unicode
---
 .gitignore    | 1 +
 m17n-lib.spec | 3 ++-
 sources       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9bc4420..0aba3eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ m17n-lib-1.6.1.tar.gz
 /m17n-lib-1.8.3.tar.gz
 /m17n-lib-1.8.4.tar.gz
 /m17n-lib-1.8.5.tar.gz
+/m17n-lib-1.8.6.tar.gz
diff --git a/m17n-lib.spec b/m17n-lib.spec
index c74e1e2..58c646a 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name:           m17n-lib
-Version:        1.8.5
+Version:        1.8.6
 Release:        %autorelease
 Summary:        Multilingual text library
 
@@ -120,6 +120,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_bindir}/m17n-dump
 %{_bindir}/m17n-edit
 %{_bindir}/m17n-view
+%{_bindir}/m17n-input-test
 %{_libdir}/m17n/1.0/libm17n-X.so
 %{_libdir}/m17n/1.0/libm17n-gd.so
 %{_libdir}/libm17n-gui.so.*
diff --git a/sources b/sources
index 0005908..2a38cb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (m17n-lib-1.8.5.tar.gz) = ac343e27df790161d9459bb0ef9827302cad6e1e291a5b245867d4bc93b2aa53faf5feb22af655de3402afda0665ac1d0ed0b765bd48c6bd458cea15dc325fc3
+SHA512 (m17n-lib-1.8.6.tar.gz) = 4fe3e9d2f88a90e8e9b30ee53a71612f937ab3d4c5243075f39de13818522e5c595840f67b3411b03d403affeafeb1802158b6ae8ddf80a1e695d1105b595a59

From aaf7d119d54ed71a5b612fe1ebdfcfddf5c2d510 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 21:09:52 +0000
Subject: [PATCH 34/34] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild