From 82b8539f1ade447b2ddadbf97a76c51102d810c4 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 6 Jul 2020 21:28:09 +0900
Subject: [PATCH 01/28] New upstream release.   Resolves: rhbz#1853939

---
 .gitignore   | 1 +
 fribidi.spec | 6 +++++-
 sources      | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8c14d10..9ef551b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /fribidi-1.0.7.tar.bz2
 /fribidi-1.0.8.tar.bz2
 /fribidi-1.0.9.tar.xz
+/fribidi-1.0.10.tar.xz
diff --git a/fribidi.spec b/fribidi.spec
index 8557f1e..9d12dc6 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,6 +1,6 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.9
+Version: 1.0.10
 Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
@@ -83,6 +83,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Mon Jul  6 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.10-1
+- New upstream release.
+  Resolves: rhbz#1853939
+
 * Thu Mar 05 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.9-1
 - New upstream release.
   Resolves: rhbz#1809478
diff --git a/sources b/sources
index 5ec9c97..358bd5d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (fribidi-1.0.8.tar.bz2) = d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
-SHA512 (fribidi-1.0.9.tar.xz) = e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
+SHA512 (fribidi-1.0.10.tar.xz) = cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360

From 40d1c05820b208a0495ce569c501d62faba37ce9 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 6 Jul 2020 21:30:17 +0900
Subject: [PATCH 02/28] New upstream release.   Resolves: rhbz#1853939

---
 .gitignore   | 1 +
 fribidi.spec | 6 +++++-
 sources      | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8c14d10..9ef551b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /fribidi-1.0.7.tar.bz2
 /fribidi-1.0.8.tar.bz2
 /fribidi-1.0.9.tar.xz
+/fribidi-1.0.10.tar.xz
diff --git a/fribidi.spec b/fribidi.spec
index 8557f1e..9d12dc6 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,6 +1,6 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.9
+Version: 1.0.10
 Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
@@ -83,6 +83,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Mon Jul  6 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.10-1
+- New upstream release.
+  Resolves: rhbz#1853939
+
 * Thu Mar 05 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.9-1
 - New upstream release.
   Resolves: rhbz#1809478
diff --git a/sources b/sources
index 5ec9c97..358bd5d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (fribidi-1.0.8.tar.bz2) = d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
-SHA512 (fribidi-1.0.9.tar.xz) = e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed
+SHA512 (fribidi-1.0.10.tar.xz) = cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360

From 856b4f32cced47492e992e695d111cfd2157e1d3 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 6 Jul 2020 21:37:23 +0900
Subject: [PATCH 03/28] New upstream release.   Resolves: rhbz#1853939

---
 fribidi.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fribidi.spec b/fribidi.spec
index 9d12dc6..5766aa1 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -11,7 +11,6 @@ BuildRequires: automake autoconf libtool
 %else
 BuildRequires: meson
 %endif
-Patch0: %{name}-drop-bundled-gnulib.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),

From 8cfe92dae2339bd5a8517d9e083b1b1183edbc37 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 7 Jul 2020 21:15:08 +0900
Subject: [PATCH 04/28] Update the patch to drop bundled gnulib.

---
 fribidi-drop-bundled-gnulib.patch | 48 +++++++++++++++----------------
 fribidi.spec                      |  6 +++-
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/fribidi-drop-bundled-gnulib.patch b/fribidi-drop-bundled-gnulib.patch
index 04c42f9..7857369 100644
--- a/fribidi-drop-bundled-gnulib.patch
+++ b/fribidi-drop-bundled-gnulib.patch
@@ -1,6 +1,6 @@
-diff -pruN fribidi-1.0.6.orig/bin/Makefile.am fribidi-1.0.6/bin/Makefile.am
---- fribidi-1.0.6.orig/bin/Makefile.am	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/bin/Makefile.am	2019-09-27 18:14:02.407881337 +0900
+diff -pruN fribidi-1.0.10.orig/bin/Makefile.am fribidi-1.0.10/bin/Makefile.am
+--- fribidi-1.0.10.orig/bin/Makefile.am	2020-07-06 04:17:23.000000000 +0900
++++ fribidi-1.0.10/bin/Makefile.am	2020-07-07 21:09:49.076237457 +0900
 @@ -2,11 +2,9 @@ bin_PROGRAMS = fribidi
  
  noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
@@ -14,10 +14,10 @@ diff -pruN fribidi-1.0.6.orig/bin/Makefile.am fribidi-1.0.6/bin/Makefile.am
 +fribidi_benchmark_SOURCES = fribidi-benchmark.c
  
  AM_CPPFLAGS = \
- 		-I$(top_builddir)/lib \
-diff -pruN fribidi-1.0.6.orig/bin/getopt.c fribidi-1.0.6/bin/getopt.c
---- fribidi-1.0.6.orig/bin/getopt.c	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/bin/getopt.c	1970-01-01 09:00:00.000000000 +0900
+ 		@FRIBIDI_CPPFLAGS@ \
+diff -pruN fribidi-1.0.10.orig/bin/getopt.c fribidi-1.0.10/bin/getopt.c
+--- fribidi-1.0.10.orig/bin/getopt.c	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.10/bin/getopt.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,1268 +0,0 @@
 -/* Getopt for GNU.
 -   NOTE: getopt is now part of the C library, so if you don't know what
@@ -1287,9 +1287,9 @@ diff -pruN fribidi-1.0.6.orig/bin/getopt.c fribidi-1.0.6/bin/getopt.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.6.orig/bin/getopt.h fribidi-1.0.6/bin/getopt.h
---- fribidi-1.0.6.orig/bin/getopt.h	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/bin/getopt.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.10.orig/bin/getopt.h fribidi-1.0.10/bin/getopt.h
+--- fribidi-1.0.10.orig/bin/getopt.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.10/bin/getopt.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,187 +0,0 @@
 -/* Declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -1478,9 +1478,9 @@ diff -pruN fribidi-1.0.6.orig/bin/getopt.h fribidi-1.0.6/bin/getopt.h
 -#undef __need_getopt
 -
 -#endif				/* getopt.h */
-diff -pruN fribidi-1.0.6.orig/bin/getopt1.c fribidi-1.0.6/bin/getopt1.c
---- fribidi-1.0.6.orig/bin/getopt1.c	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/bin/getopt1.c	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.10.orig/bin/getopt1.c fribidi-1.0.10/bin/getopt1.c
+--- fribidi-1.0.10.orig/bin/getopt1.c	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.10/bin/getopt1.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,213 +0,0 @@
 -/* getopt_long and getopt_long_only entry points for GNU getopt.
 -   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
@@ -1695,9 +1695,9 @@ diff -pruN fribidi-1.0.6.orig/bin/getopt1.c fribidi-1.0.6/bin/getopt1.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.6.orig/bin/getopt_int.h fribidi-1.0.6/bin/getopt_int.h
---- fribidi-1.0.6.orig/bin/getopt_int.h	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/bin/getopt_int.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.10.orig/bin/getopt_int.h fribidi-1.0.10/bin/getopt_int.h
+--- fribidi-1.0.10.orig/bin/getopt_int.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.10/bin/getopt_int.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,145 +0,0 @@
 -/* Internal declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -1844,20 +1844,20 @@ diff -pruN fribidi-1.0.6.orig/bin/getopt_int.h fribidi-1.0.6/bin/getopt_int.h
 -);
 -
 -#endif /* getopt_int.h */
-diff -pruN fribidi-1.0.6.orig/bin/gettext.h fribidi-1.0.6/bin/gettext.h
---- fribidi-1.0.6.orig/bin/gettext.h	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/bin/gettext.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.10.orig/bin/gettext.h fribidi-1.0.10/bin/gettext.h
+--- fribidi-1.0.10.orig/bin/gettext.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.10/bin/gettext.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,2 +0,0 @@
 -#undef gettext
 -#define gettext
-diff -pruN fribidi-1.0.6.orig/bin/meson.build fribidi-1.0.6/bin/meson.build
---- fribidi-1.0.6.orig/bin/meson.build	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/bin/meson.build	2019-09-27 18:15:26.375883489 +0900
+diff -pruN fribidi-1.0.10.orig/bin/meson.build fribidi-1.0.10/bin/meson.build
+--- fribidi-1.0.10.orig/bin/meson.build	2020-07-06 04:17:23.000000000 +0900
++++ fribidi-1.0.10/bin/meson.build	2020-07-07 21:10:30.931408884 +0900
 @@ -1,12 +1,12 @@
  fribidi = executable('fribidi',
 -  'fribidi-main.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
 +  'fribidi-main.c', fribidi_unicode_version_h,
-   c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+   c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
    include_directories: incs,
    link_with: libfribidi,
    install: true)
@@ -1865,6 +1865,6 @@ diff -pruN fribidi-1.0.6.orig/bin/meson.build fribidi-1.0.6/bin/meson.build
  executable('fribidi-benchmark',
 -  'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
 +  'fribidi-benchmark.c', fribidi_unicode_version_h,
-   c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+   c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
    include_directories: incs,
    link_with: libfribidi,
diff --git a/fribidi.spec b/fribidi.spec
index 5766aa1..ba73dde 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -11,6 +11,7 @@ BuildRequires: automake autoconf libtool
 %else
 BuildRequires: meson
 %endif
+Patch0: fribidi-drop-bundled-gnulib.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -82,6 +83,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Tue Jul  7 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.10-2
+- Update the patch to drop bundled gnulib.
+
 * Mon Jul  6 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.10-1
 - New upstream release.
   Resolves: rhbz#1853939

From b1aceb6affa2822738465190a323c20b6a4b67e7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 17:52:17 +0000
Subject: [PATCH 05/28] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index ba73dde..529c0e3 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -83,6 +83,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Jul  7 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.10-2
 - Update the patch to drop bundled gnulib.
 

From b9ada54dc4ac31fcefe98afd06e25afe6a3c2d34 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Tue, 5 Jan 2021 00:48:05 +0000
Subject: [PATCH 06/28] Add BuildRequires: make

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

diff --git a/fribidi.spec b/fribidi.spec
index 529c0e3..6512e35 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -11,6 +11,7 @@ BuildRequires: automake autoconf libtool
 %else
 BuildRequires: meson
 %endif
+BuildRequires: make
 Patch0: fribidi-drop-bundled-gnulib.patch
 
 %description

From 0b143efebb69eaaf65916695cdbf8e7641dd4007 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 05:57:52 +0000
Subject: [PATCH 07/28] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 6512e35..4f26140 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.10
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From ff0b009a2af20f3fdb609e6a82a6e252b6d1ff17 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 23:24:01 +0000
Subject: [PATCH 08/28] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 4f26140..da5be29 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.10
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From c8f80e17e52d03b9e0d359c21b439a338be31f71 Mon Sep 17 00:00:00 2001
From: Fedora Release Monitoring <release-monitoring@fedoraproject.org>
Date: Fri, 24 Sep 2021 05:55:49 +0000
Subject: [PATCH 09/28] Update to 1.0.11 (#2007504)

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

diff --git a/fribidi.spec b/fribidi.spec
index da5be29..4bcc35b 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.10
-Release: 5%{?dist}
+Version: 1.0.11
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Fri Sep 24 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1.0.11-1
+- Update to 1.0.11 (#2007504)
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From dcfe222a1d7eaadbfbc7aebe1372b040e3e1ac23 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 27 Sep 2021 17:19:32 +0900
Subject: [PATCH 10/28] Update to 1.0.11 (#2007504)

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9ef551b..12a2de6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /fribidi-1.0.8.tar.bz2
 /fribidi-1.0.9.tar.xz
 /fribidi-1.0.10.tar.xz
+/fribidi-1.0.11.tar.xz
diff --git a/sources b/sources
index 358bd5d..b35a6c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.10.tar.xz) = cb51920012c3c7507c17e2beb1dbbcfb8d7c6404e4cb54b260a332754a0d5b103d8834d77e8795651b3f38069c9bd2e9914c21b001411a72f9ffe1ec1ef2f360
+SHA512 (fribidi-1.0.11.tar.xz) = 6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c

From 27d242f0356ef47a4a0499a90ebc83ad2581fd62 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 03:27:49 +0000
Subject: [PATCH 11/28] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 4bcc35b..5cc5b8f 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Sep 24 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1.0.11-1
 - Update to 1.0.11 (#2007504)
 

From f7d679387eea2525658d634bfaff1a481da9d09a Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 1 Apr 2022 20:37:05 +0900
Subject: [PATCH 12/28] Fix security issues, CVE-2022-25308, CVE-2022-25309,
 CVE-2022-25310.

  Resolves: rhbz#2067039, rhbz#2067043, rhbz#2067045
---
 fribidi-CVE-2019-18397.patch | 27 --------------------
 fribidi-CVE-2022-25308.patch | 48 ++++++++++++++++++++++++++++++++++++
 fribidi-CVE-2022-25309.patch | 30 ++++++++++++++++++++++
 fribidi-CVE-2022-25310.patch | 28 +++++++++++++++++++++
 fribidi.spec                 |  9 ++++++-
 5 files changed, 114 insertions(+), 28 deletions(-)
 delete mode 100644 fribidi-CVE-2019-18397.patch
 create mode 100644 fribidi-CVE-2022-25308.patch
 create mode 100644 fribidi-CVE-2022-25309.patch
 create mode 100644 fribidi-CVE-2022-25310.patch

diff --git a/fribidi-CVE-2019-18397.patch b/fribidi-CVE-2019-18397.patch
deleted file mode 100644
index a734a87..0000000
--- a/fribidi-CVE-2019-18397.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001
-From: Dov Grobgeld <dov.grobgeld@gmail.com>
-Date: Thu, 24 Oct 2019 09:37:29 +0300
-Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL
-
----
- lib/fribidi-bidi.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c
-index 6c84392..d384878 100644
---- a/lib/fribidi-bidi.c
-+++ b/lib/fribidi-bidi.c
-@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex (
-             }
- 
- 	  RL_LEVEL (pp) = level;
--          RL_ISOLATE_LEVEL (pp) = isolate_level++;
-+          RL_ISOLATE_LEVEL (pp) = isolate_level;
-+          if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1)
-+              isolate_level++;
-           base_level_per_iso_level[isolate_level] = new_level;
- 
- 	  if (!FRIBIDI_IS_NEUTRAL (override))
--- 
-2.23.0
-
diff --git a/fribidi-CVE-2022-25308.patch b/fribidi-CVE-2022-25308.patch
new file mode 100644
index 0000000..dbdbe5a
--- /dev/null
+++ b/fribidi-CVE-2022-25308.patch
@@ -0,0 +1,48 @@
+From ad3a19e6372b1e667128ed1ea2f49919884587e1 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Thu, 17 Feb 2022 17:30:12 +0900
+Subject: [PATCH 1/3] Fix the stack buffer overflow issue
+
+strlen() could returns 0. Without a conditional check for len,
+accessing S_ pointer with len - 1 may causes a stack buffer overflow.
+
+AddressSanitizer reports this like:
+==1219243==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffdce043c1f at pc 0x000000403547 bp 0x7ffdce0
+43b30 sp 0x7ffdce043b28
+READ of size 1 at 0x7ffdce043c1f thread T0
+    #0 0x403546 in main ../bin/fribidi-main.c:393
+    #1 0x7f226804e58f in __libc_start_call_main (/lib64/libc.so.6+0x2d58f)
+    #2 0x7f226804e648 in __libc_start_main_impl (/lib64/libc.so.6+0x2d648)
+    #3 0x4036f4 in _start (/tmp/fribidi/build/bin/fribidi+0x4036f4)
+
+Address 0x7ffdce043c1f is located in stack of thread T0 at offset 63 in frame
+    #0 0x4022bf in main ../bin/fribidi-main.c:193
+
+  This frame has 5 object(s):
+    [32, 36) 'option_index' (line 233)
+    [48, 52) 'base' (line 386)
+    [64, 65064) 'S_' (line 375) <== Memory access at offset 63 underflows this variable
+    [65328, 130328) 'outstring' (line 385)
+    [130592, 390592) 'logical' (line 384)
+
+This fixes https://github.com/fribidi/fribidi/issues/181
+---
+ bin/fribidi-main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
+index 3cf9fe1..3ae4fb6 100644
+--- a/bin/fribidi-main.c
++++ b/bin/fribidi-main.c
+@@ -390,7 +390,7 @@ FRIBIDI_END_IGNORE_DEPRECATIONS
+ 	    S_[sizeof (S_) - 1] = 0;
+ 	    len = strlen (S_);
+ 	    /* chop */
+-	    if (S_[len - 1] == '\n')
++	    if (len > 0 && S_[len - 1] == '\n')
+ 	      {
+ 		len--;
+ 		S_[len] = '\0';
+-- 
+2.35.1
+
diff --git a/fribidi-CVE-2022-25309.patch b/fribidi-CVE-2022-25309.patch
new file mode 100644
index 0000000..454a5ed
--- /dev/null
+++ b/fribidi-CVE-2022-25309.patch
@@ -0,0 +1,30 @@
+From f22593b82b5d1668d1997dbccd10a9c31ffea3b3 Mon Sep 17 00:00:00 2001
+From: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Fri, 25 Mar 2022 09:09:49 +0300
+Subject: [PATCH 2/3] Protected against garbage in the CapRTL encoder
+
+---
+ lib/fribidi-char-sets-cap-rtl.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/fribidi-char-sets-cap-rtl.c b/lib/fribidi-char-sets-cap-rtl.c
+index b0c0e4a..f74e010 100644
+--- a/lib/fribidi-char-sets-cap-rtl.c
++++ b/lib/fribidi-char-sets-cap-rtl.c
+@@ -232,7 +232,12 @@ fribidi_cap_rtl_to_unicode (
+ 	    }
+ 	}
+       else
+-	us[j++] = caprtl_to_unicode[(int) s[i]];
++      {
++        if ((int)s[i] < 0)
++          us[j++] = '?';
++        else
++          us[j++] = caprtl_to_unicode[(int) s[i]];
++      }
+     }
+ 
+   return j;
+-- 
+2.35.1
+
diff --git a/fribidi-CVE-2022-25310.patch b/fribidi-CVE-2022-25310.patch
new file mode 100644
index 0000000..09fd1c3
--- /dev/null
+++ b/fribidi-CVE-2022-25310.patch
@@ -0,0 +1,28 @@
+From 175850b03e1af251d705c1d04b2b9b3c1c06e48f Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Thu, 17 Feb 2022 19:06:10 +0900
+Subject: [PATCH 3/3] Fix SEGV issue in fribidi_remove_bidi_marks
+
+Escape from fribidi_remove_bidi_marks() immediately if str is null.
+
+This fixes https://github.com/fribidi/fribidi/issues/183
+---
+ lib/fribidi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/fribidi.c b/lib/fribidi.c
+index f5da0da..70bdab2 100644
+--- a/lib/fribidi.c
++++ b/lib/fribidi.c
+@@ -74,7 +74,7 @@ fribidi_remove_bidi_marks (
+   fribidi_boolean status = false;
+ 
+   if UNLIKELY
+-    (len == 0)
++    (len == 0 || str == NULL)
+     {
+       status = true;
+       goto out;
+-- 
+2.35.1
+
diff --git a/fribidi.spec b/fribidi.spec
index 5cc5b8f..3af25a2 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -13,6 +13,9 @@ BuildRequires: meson
 %endif
 BuildRequires: make
 Patch0: fribidi-drop-bundled-gnulib.patch
+Patch1: fribidi-CVE-2022-25308.patch
+Patch2: fribidi-CVE-2022-25309.patch
+Patch3: fribidi-CVE-2022-25310.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -84,6 +87,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Fri Apr  1 2022 Akira TAGOH <tagoh@redhat.com> - 1.0.11-3
+- Fix security issues, CVE-2022-25308, CVE-2022-25309, CVE-2022-25310.
+  Resolves: rhbz#2067039, rhbz#2067043, rhbz#2067045
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 47d70eb96ded56c1c6c5666e30d4ccf6393a0a28 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 21 Apr 2022 15:11:53 +0900
Subject: [PATCH 13/28] New upstream release.

  Resolves: rhbz#2077311
---
 .gitignore                   |  1 +
 fribidi-CVE-2022-25308.patch | 48 ------------------------------------
 fribidi-CVE-2022-25309.patch | 30 ----------------------
 fribidi-CVE-2022-25310.patch | 28 ---------------------
 fribidi.spec                 | 11 +++++----
 sources                      |  2 +-
 6 files changed, 8 insertions(+), 112 deletions(-)
 delete mode 100644 fribidi-CVE-2022-25308.patch
 delete mode 100644 fribidi-CVE-2022-25309.patch
 delete mode 100644 fribidi-CVE-2022-25310.patch

diff --git a/.gitignore b/.gitignore
index 12a2de6..11d5eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /fribidi-1.0.9.tar.xz
 /fribidi-1.0.10.tar.xz
 /fribidi-1.0.11.tar.xz
+/fribidi-1.0.12.tar.xz
diff --git a/fribidi-CVE-2022-25308.patch b/fribidi-CVE-2022-25308.patch
deleted file mode 100644
index dbdbe5a..0000000
--- a/fribidi-CVE-2022-25308.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ad3a19e6372b1e667128ed1ea2f49919884587e1 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 17 Feb 2022 17:30:12 +0900
-Subject: [PATCH 1/3] Fix the stack buffer overflow issue
-
-strlen() could returns 0. Without a conditional check for len,
-accessing S_ pointer with len - 1 may causes a stack buffer overflow.
-
-AddressSanitizer reports this like:
-==1219243==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7ffdce043c1f at pc 0x000000403547 bp 0x7ffdce0
-43b30 sp 0x7ffdce043b28
-READ of size 1 at 0x7ffdce043c1f thread T0
-    #0 0x403546 in main ../bin/fribidi-main.c:393
-    #1 0x7f226804e58f in __libc_start_call_main (/lib64/libc.so.6+0x2d58f)
-    #2 0x7f226804e648 in __libc_start_main_impl (/lib64/libc.so.6+0x2d648)
-    #3 0x4036f4 in _start (/tmp/fribidi/build/bin/fribidi+0x4036f4)
-
-Address 0x7ffdce043c1f is located in stack of thread T0 at offset 63 in frame
-    #0 0x4022bf in main ../bin/fribidi-main.c:193
-
-  This frame has 5 object(s):
-    [32, 36) 'option_index' (line 233)
-    [48, 52) 'base' (line 386)
-    [64, 65064) 'S_' (line 375) <== Memory access at offset 63 underflows this variable
-    [65328, 130328) 'outstring' (line 385)
-    [130592, 390592) 'logical' (line 384)
-
-This fixes https://github.com/fribidi/fribidi/issues/181
----
- bin/fribidi-main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
-index 3cf9fe1..3ae4fb6 100644
---- a/bin/fribidi-main.c
-+++ b/bin/fribidi-main.c
-@@ -390,7 +390,7 @@ FRIBIDI_END_IGNORE_DEPRECATIONS
- 	    S_[sizeof (S_) - 1] = 0;
- 	    len = strlen (S_);
- 	    /* chop */
--	    if (S_[len - 1] == '\n')
-+	    if (len > 0 && S_[len - 1] == '\n')
- 	      {
- 		len--;
- 		S_[len] = '\0';
--- 
-2.35.1
-
diff --git a/fribidi-CVE-2022-25309.patch b/fribidi-CVE-2022-25309.patch
deleted file mode 100644
index 454a5ed..0000000
--- a/fribidi-CVE-2022-25309.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f22593b82b5d1668d1997dbccd10a9c31ffea3b3 Mon Sep 17 00:00:00 2001
-From: Dov Grobgeld <dov.grobgeld@gmail.com>
-Date: Fri, 25 Mar 2022 09:09:49 +0300
-Subject: [PATCH 2/3] Protected against garbage in the CapRTL encoder
-
----
- lib/fribidi-char-sets-cap-rtl.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/lib/fribidi-char-sets-cap-rtl.c b/lib/fribidi-char-sets-cap-rtl.c
-index b0c0e4a..f74e010 100644
---- a/lib/fribidi-char-sets-cap-rtl.c
-+++ b/lib/fribidi-char-sets-cap-rtl.c
-@@ -232,7 +232,12 @@ fribidi_cap_rtl_to_unicode (
- 	    }
- 	}
-       else
--	us[j++] = caprtl_to_unicode[(int) s[i]];
-+      {
-+        if ((int)s[i] < 0)
-+          us[j++] = '?';
-+        else
-+          us[j++] = caprtl_to_unicode[(int) s[i]];
-+      }
-     }
- 
-   return j;
--- 
-2.35.1
-
diff --git a/fribidi-CVE-2022-25310.patch b/fribidi-CVE-2022-25310.patch
deleted file mode 100644
index 09fd1c3..0000000
--- a/fribidi-CVE-2022-25310.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 175850b03e1af251d705c1d04b2b9b3c1c06e48f Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 17 Feb 2022 19:06:10 +0900
-Subject: [PATCH 3/3] Fix SEGV issue in fribidi_remove_bidi_marks
-
-Escape from fribidi_remove_bidi_marks() immediately if str is null.
-
-This fixes https://github.com/fribidi/fribidi/issues/183
----
- lib/fribidi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/fribidi.c b/lib/fribidi.c
-index f5da0da..70bdab2 100644
---- a/lib/fribidi.c
-+++ b/lib/fribidi.c
-@@ -74,7 +74,7 @@ fribidi_remove_bidi_marks (
-   fribidi_boolean status = false;
- 
-   if UNLIKELY
--    (len == 0)
-+    (len == 0 || str == NULL)
-     {
-       status = true;
-       goto out;
--- 
-2.35.1
-
diff --git a/fribidi.spec b/fribidi.spec
index 3af25a2..c02da6a 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.11
-Release: 3%{?dist}
+Version: 1.0.12
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -13,9 +13,6 @@ BuildRequires: meson
 %endif
 BuildRequires: make
 Patch0: fribidi-drop-bundled-gnulib.patch
-Patch1: fribidi-CVE-2022-25308.patch
-Patch2: fribidi-CVE-2022-25309.patch
-Patch3: fribidi-CVE-2022-25310.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -87,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Thu Apr 21 2022 Akira TAGOH <tagoh@redhat.com> - 1.0.12-1
+- New upstream release.
+  Resolves: rhbz#2077311
+
 * Fri Apr  1 2022 Akira TAGOH <tagoh@redhat.com> - 1.0.11-3
 - Fix security issues, CVE-2022-25308, CVE-2022-25309, CVE-2022-25310.
   Resolves: rhbz#2067039, rhbz#2067043, rhbz#2067045
diff --git a/sources b/sources
index b35a6c5..50d020c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.11.tar.xz) = 6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c
+SHA512 (fribidi-1.0.12.tar.xz) = cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49

From e66c4fe189affd490098520ceeefe64e87ab519c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 03:40:04 +0000
Subject: [PATCH 14/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index c02da6a..db9d0f0 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Apr 21 2022 Akira TAGOH <tagoh@redhat.com> - 1.0.12-1
 - New upstream release.
   Resolves: rhbz#2077311

From 92ee0ce93a8e68d902f5e7ef26939e6121e0522e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 03:56:10 +0000
Subject: [PATCH 15/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index db9d0f0..8ca6efc 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 1700913c02e32341234ec44d35653bc98d4fd95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 24 Feb 2023 15:07:18 +0000
Subject: [PATCH 16/28] migrated to SPDX license

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

diff --git a/fribidi.spec b/fribidi.spec
index 8ca6efc..acd8eaf 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,10 +1,10 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.12
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
-License: LGPLv2+ and UCD
+License: LGPL-2.1-or-later AND Unicode-DFS-2016
 BuildRequires: gcc
 %if 0%{?rhel} && 0%{?rhel} <= 8
 BuildRequires: automake autoconf libtool
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Fri Feb 24 2023 Caolán McNamara <caolanm@redhat.com> - 1.0.12-4
+- migrated to SPDX license
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From c240741aaae72986f07d907b3d68cb90fe3b224d Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 17 May 2023 17:16:06 +0900
Subject: [PATCH 17/28] New upstream release.

  Resolves: rhbz#2207796
---
 .gitignore                        |  1 +
 fribidi-drop-bundled-gnulib.patch | 46 +++++++++++++++----------------
 fribidi.spec                      |  8 ++++--
 sources                           |  2 +-
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 11d5eeb..493abf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /fribidi-1.0.10.tar.xz
 /fribidi-1.0.11.tar.xz
 /fribidi-1.0.12.tar.xz
+/fribidi-1.0.13.tar.xz
diff --git a/fribidi-drop-bundled-gnulib.patch b/fribidi-drop-bundled-gnulib.patch
index 7857369..4e8a82d 100644
--- a/fribidi-drop-bundled-gnulib.patch
+++ b/fribidi-drop-bundled-gnulib.patch
@@ -1,6 +1,6 @@
-diff -pruN fribidi-1.0.10.orig/bin/Makefile.am fribidi-1.0.10/bin/Makefile.am
---- fribidi-1.0.10.orig/bin/Makefile.am	2020-07-06 04:17:23.000000000 +0900
-+++ fribidi-1.0.10/bin/Makefile.am	2020-07-07 21:09:49.076237457 +0900
+diff -pruN fribidi-1.0.13.orig/bin/Makefile.am fribidi-1.0.13/bin/Makefile.am
+--- fribidi-1.0.13.orig/bin/Makefile.am	2020-07-06 04:17:23.000000000 +0900
++++ fribidi-1.0.13/bin/Makefile.am	2023-05-17 17:09:19.965214651 +0900
 @@ -2,11 +2,9 @@ bin_PROGRAMS = fribidi
  
  noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
@@ -15,9 +15,9 @@ diff -pruN fribidi-1.0.10.orig/bin/Makefile.am fribidi-1.0.10/bin/Makefile.am
  
  AM_CPPFLAGS = \
  		@FRIBIDI_CPPFLAGS@ \
-diff -pruN fribidi-1.0.10.orig/bin/getopt.c fribidi-1.0.10/bin/getopt.c
---- fribidi-1.0.10.orig/bin/getopt.c	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.10/bin/getopt.c	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.13.orig/bin/getopt.c fribidi-1.0.13/bin/getopt.c
+--- fribidi-1.0.13.orig/bin/getopt.c	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.13/bin/getopt.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,1268 +0,0 @@
 -/* Getopt for GNU.
 -   NOTE: getopt is now part of the C library, so if you don't know what
@@ -1287,9 +1287,9 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt.c fribidi-1.0.10/bin/getopt.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.10.orig/bin/getopt.h fribidi-1.0.10/bin/getopt.h
---- fribidi-1.0.10.orig/bin/getopt.h	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.10/bin/getopt.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.13.orig/bin/getopt.h fribidi-1.0.13/bin/getopt.h
+--- fribidi-1.0.13.orig/bin/getopt.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.13/bin/getopt.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,187 +0,0 @@
 -/* Declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -1478,9 +1478,9 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt.h fribidi-1.0.10/bin/getopt.h
 -#undef __need_getopt
 -
 -#endif				/* getopt.h */
-diff -pruN fribidi-1.0.10.orig/bin/getopt1.c fribidi-1.0.10/bin/getopt1.c
---- fribidi-1.0.10.orig/bin/getopt1.c	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.10/bin/getopt1.c	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.13.orig/bin/getopt1.c fribidi-1.0.13/bin/getopt1.c
+--- fribidi-1.0.13.orig/bin/getopt1.c	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.13/bin/getopt1.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,213 +0,0 @@
 -/* getopt_long and getopt_long_only entry points for GNU getopt.
 -   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
@@ -1695,9 +1695,9 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt1.c fribidi-1.0.10/bin/getopt1.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.10.orig/bin/getopt_int.h fribidi-1.0.10/bin/getopt_int.h
---- fribidi-1.0.10.orig/bin/getopt_int.h	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.10/bin/getopt_int.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.13.orig/bin/getopt_int.h fribidi-1.0.13/bin/getopt_int.h
+--- fribidi-1.0.13.orig/bin/getopt_int.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.13/bin/getopt_int.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,145 +0,0 @@
 -/* Internal declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -1844,20 +1844,20 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt_int.h fribidi-1.0.10/bin/getopt_int.h
 -);
 -
 -#endif /* getopt_int.h */
-diff -pruN fribidi-1.0.10.orig/bin/gettext.h fribidi-1.0.10/bin/gettext.h
---- fribidi-1.0.10.orig/bin/gettext.h	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.10/bin/gettext.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.13.orig/bin/gettext.h fribidi-1.0.13/bin/gettext.h
+--- fribidi-1.0.13.orig/bin/gettext.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.13/bin/gettext.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,2 +0,0 @@
 -#undef gettext
 -#define gettext
-diff -pruN fribidi-1.0.10.orig/bin/meson.build fribidi-1.0.10/bin/meson.build
---- fribidi-1.0.10.orig/bin/meson.build	2020-07-06 04:17:23.000000000 +0900
-+++ fribidi-1.0.10/bin/meson.build	2020-07-07 21:10:30.931408884 +0900
+diff -pruN fribidi-1.0.13.orig/bin/meson.build fribidi-1.0.13/bin/meson.build
+--- fribidi-1.0.13.orig/bin/meson.build	2023-05-17 03:47:48.000000000 +0900
++++ fribidi-1.0.13/bin/meson.build	2023-05-17 17:11:43.178425907 +0900
 @@ -1,12 +1,12 @@
  fribidi = executable('fribidi',
 -  'fribidi-main.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
 +  'fribidi-main.c', fribidi_unicode_version_h,
-   c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
+   c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs,
    include_directories: incs,
    link_with: libfribidi,
    install: true)
@@ -1865,6 +1865,6 @@ diff -pruN fribidi-1.0.10.orig/bin/meson.build fribidi-1.0.10/bin/meson.build
  executable('fribidi-benchmark',
 -  'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
 +  'fribidi-benchmark.c', fribidi_unicode_version_h,
-   c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
+   c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs,
    include_directories: incs,
    link_with: libfribidi,
diff --git a/fribidi.spec b/fribidi.spec
index acd8eaf..03e82f7 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.12
-Release: 4%{?dist}
+Version: 1.0.13
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -84,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed May 17 2023 Akira TAGOH <tagoh@redhat.com> - 1.0.13-1
+- New upstream release.
+  Resolves: rhbz#2207796
+
 * Fri Feb 24 2023 Caolán McNamara <caolanm@redhat.com> - 1.0.12-4
 - migrated to SPDX license
 
diff --git a/sources b/sources
index 50d020c..f806635 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.12.tar.xz) = cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49
+SHA512 (fribidi-1.0.13.tar.xz) = 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07

From 5379fcc2127cdbb22c4dfd6b4e56a19aac5fccc6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 20:17:50 +0000
Subject: [PATCH 18/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 03e82f7..4f21903 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Wed May 17 2023 Akira TAGOH <tagoh@redhat.com> - 1.0.13-1
 - New upstream release.
   Resolves: rhbz#2207796

From 93683706b3de0069d7a2b3fe547c76bfffefc9da Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 19:49:43 +0000
Subject: [PATCH 19/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 4f21903..ac3aeb4 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.13
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 011e12784e5c562807c884b19ac8e3fb7e063139 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 12:04:42 +0000
Subject: [PATCH 20/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index ac3aeb4..2998dfa 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From b277cca91739c7982dd4fa722952943dcaf76572 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 7 May 2024 21:43:30 +0900
Subject: [PATCH 21/28] New upstream release.

  Resolves: rhbz#2277227
---
 .gitignore                        |  1 +
 fribidi-drop-bundled-gnulib.patch | 49 ++++++++++++++++---------------
 fribidi.spec                      |  8 +++--
 sources                           |  2 +-
 4 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 493abf0..756e727 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /fribidi-1.0.11.tar.xz
 /fribidi-1.0.12.tar.xz
 /fribidi-1.0.13.tar.xz
+/fribidi-1.0.14.tar.xz
diff --git a/fribidi-drop-bundled-gnulib.patch b/fribidi-drop-bundled-gnulib.patch
index 4e8a82d..1315922 100644
--- a/fribidi-drop-bundled-gnulib.patch
+++ b/fribidi-drop-bundled-gnulib.patch
@@ -1,6 +1,6 @@
-diff -pruN fribidi-1.0.13.orig/bin/Makefile.am fribidi-1.0.13/bin/Makefile.am
---- fribidi-1.0.13.orig/bin/Makefile.am	2020-07-06 04:17:23.000000000 +0900
-+++ fribidi-1.0.13/bin/Makefile.am	2023-05-17 17:09:19.965214651 +0900
+diff -pruN fribidi-1.0.14.orig/bin/Makefile.am fribidi-1.0.14/bin/Makefile.am
+--- fribidi-1.0.14.orig/bin/Makefile.am	2020-07-06 04:17:23.000000000 +0900
++++ fribidi-1.0.14/bin/Makefile.am	2024-05-07 21:40:04.500166714 +0900
 @@ -2,11 +2,9 @@ bin_PROGRAMS = fribidi
  
  noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
@@ -15,9 +15,9 @@ diff -pruN fribidi-1.0.13.orig/bin/Makefile.am fribidi-1.0.13/bin/Makefile.am
  
  AM_CPPFLAGS = \
  		@FRIBIDI_CPPFLAGS@ \
-diff -pruN fribidi-1.0.13.orig/bin/getopt.c fribidi-1.0.13/bin/getopt.c
---- fribidi-1.0.13.orig/bin/getopt.c	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.13/bin/getopt.c	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.14.orig/bin/getopt.c fribidi-1.0.14/bin/getopt.c
+--- fribidi-1.0.14.orig/bin/getopt.c	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.14/bin/getopt.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,1268 +0,0 @@
 -/* Getopt for GNU.
 -   NOTE: getopt is now part of the C library, so if you don't know what
@@ -1287,9 +1287,9 @@ diff -pruN fribidi-1.0.13.orig/bin/getopt.c fribidi-1.0.13/bin/getopt.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.13.orig/bin/getopt.h fribidi-1.0.13/bin/getopt.h
---- fribidi-1.0.13.orig/bin/getopt.h	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.13/bin/getopt.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.14.orig/bin/getopt.h fribidi-1.0.14/bin/getopt.h
+--- fribidi-1.0.14.orig/bin/getopt.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.14/bin/getopt.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,187 +0,0 @@
 -/* Declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -1478,9 +1478,9 @@ diff -pruN fribidi-1.0.13.orig/bin/getopt.h fribidi-1.0.13/bin/getopt.h
 -#undef __need_getopt
 -
 -#endif				/* getopt.h */
-diff -pruN fribidi-1.0.13.orig/bin/getopt1.c fribidi-1.0.13/bin/getopt1.c
---- fribidi-1.0.13.orig/bin/getopt1.c	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.13/bin/getopt1.c	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.14.orig/bin/getopt1.c fribidi-1.0.14/bin/getopt1.c
+--- fribidi-1.0.14.orig/bin/getopt1.c	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.14/bin/getopt1.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,213 +0,0 @@
 -/* getopt_long and getopt_long_only entry points for GNU getopt.
 -   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
@@ -1695,9 +1695,9 @@ diff -pruN fribidi-1.0.13.orig/bin/getopt1.c fribidi-1.0.13/bin/getopt1.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.13.orig/bin/getopt_int.h fribidi-1.0.13/bin/getopt_int.h
---- fribidi-1.0.13.orig/bin/getopt_int.h	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.13/bin/getopt_int.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.14.orig/bin/getopt_int.h fribidi-1.0.14/bin/getopt_int.h
+--- fribidi-1.0.14.orig/bin/getopt_int.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.14/bin/getopt_int.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,145 +0,0 @@
 -/* Internal declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -1844,23 +1844,26 @@ diff -pruN fribidi-1.0.13.orig/bin/getopt_int.h fribidi-1.0.13/bin/getopt_int.h
 -);
 -
 -#endif /* getopt_int.h */
-diff -pruN fribidi-1.0.13.orig/bin/gettext.h fribidi-1.0.13/bin/gettext.h
---- fribidi-1.0.13.orig/bin/gettext.h	2015-08-05 03:49:07.000000000 +0900
-+++ fribidi-1.0.13/bin/gettext.h	1970-01-01 09:00:00.000000000 +0900
+diff -pruN fribidi-1.0.14.orig/bin/gettext.h fribidi-1.0.14/bin/gettext.h
+--- fribidi-1.0.14.orig/bin/gettext.h	2015-08-05 03:49:07.000000000 +0900
++++ fribidi-1.0.14/bin/gettext.h	1970-01-01 09:00:00.000000000 +0900
 @@ -1,2 +0,0 @@
 -#undef gettext
 -#define gettext
-diff -pruN fribidi-1.0.13.orig/bin/meson.build fribidi-1.0.13/bin/meson.build
---- fribidi-1.0.13.orig/bin/meson.build	2023-05-17 03:47:48.000000000 +0900
-+++ fribidi-1.0.13/bin/meson.build	2023-05-17 17:11:43.178425907 +0900
-@@ -1,12 +1,12 @@
+diff -pruN fribidi-1.0.14.orig/bin/meson.build fribidi-1.0.14/bin/meson.build
+--- fribidi-1.0.14.orig/bin/meson.build	2024-03-18 03:10:09.000000000 +0900
++++ fribidi-1.0.14/bin/meson.build	2024-05-07 21:40:55.573086578 +0900
+@@ -1,7 +1,7 @@
+ # The fribidi binary is used by the test setup, so if bin=false we still
+ # need to build it for internal usage, we just won't install it.
  fribidi = executable('fribidi',
 -  'fribidi-main.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
 +  'fribidi-main.c', fribidi_unicode_version_h,
    c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs,
    include_directories: incs,
    link_with: libfribidi,
-   install: true)
+@@ -12,7 +12,7 @@ if not get_option('bin')
+ endif
  
  executable('fribidi-benchmark',
 -  'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
diff --git a/fribidi.spec b/fribidi.spec
index 2998dfa..0077a18 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.13
-Release: 4%{?dist}
+Version: 1.0.14
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -84,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Tue May  7 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.14-1
+- New upstream release.
+  Resolves: rhbz#2277227
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index f806635..602a29a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.13.tar.xz) = 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07
+SHA512 (fribidi-1.0.14.tar.xz) = 70270826625767a916156c9d752d8ad02c71b33d532060981680942c5121746bb9b0272a3f2188b9019e841c642d1ad686bbc3e7ba54a2f951baa532b01b059a

From b89fbd9492ea6fcd2890f6f655343fa2bc424649 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 5 Jun 2024 20:43:46 +0900
Subject: [PATCH 22/28] Fix broken data in fribidi.

  Resolves: rhbz#2279842
---
 fribidi.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fribidi.spec b/fribidi.spec
index 0077a18..ed575ff 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -32,6 +32,10 @@ FriBidi.
 %if 0%{?rhel} && 0%{?rhel} <= 8
 autoreconf -i
 %endif
+# Clean up older file in archive
+(cd lib;
+ rm arabic-shaping.tab.i bidi-type.tab.i brackets*.tab.i joining-type.tab.i mirroring.tab.i fribidi-unicode-version.h
+)
 
 %build
 %if 0%{?rhel} && 0%{?rhel} <= 8
@@ -84,6 +88,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Jun  5 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.14-2
+- Fix broken data in fribidi.
+  Resolves: rhbz#2279842
+
 * Tue May  7 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.14-1
 - New upstream release.
   Resolves: rhbz#2277227
@@ -364,4 +372,3 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 * Fri May 16 2003 Jeremy Katz <katzj@redhat.com> 0.10.4-2
 - Initial build in Red Hat Linux
-

From 88e747a2684f74c2311068e64b25912afbb657f4 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 10 Jun 2024 15:40:25 +0900
Subject: [PATCH 23/28] New upstream release.

  Resolves: rhbz#2291030
---
 .gitignore   | 1 +
 fribidi.spec | 8 ++++++--
 sources      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 756e727..70db7cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /fribidi-1.0.12.tar.xz
 /fribidi-1.0.13.tar.xz
 /fribidi-1.0.14.tar.xz
+/fribidi-1.0.15.tar.xz
diff --git a/fribidi.spec b/fribidi.spec
index ed575ff..5dfb771 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.14
-Release: 2%{?dist}
+Version: 1.0.15
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -88,6 +88,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Mon Jun 10 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.15-1
+- New upstream release.
+  Resolves: rhbz#2291030
+
 * Wed Jun  5 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.14-2
 - Fix broken data in fribidi.
   Resolves: rhbz#2279842
diff --git a/sources b/sources
index 602a29a..312ef7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.14.tar.xz) = 70270826625767a916156c9d752d8ad02c71b33d532060981680942c5121746bb9b0272a3f2188b9019e841c642d1ad686bbc3e7ba54a2f951baa532b01b059a
+SHA512 (fribidi-1.0.15.tar.xz) = 98295f1a7203f401d63cc1da7cce3be6975729055fea54640d25cf05a6e6bc27d2e1a3f8edd1ddf4c7fc5ff6f7f1e2daf2bf86683d4aed5988ade8bfa5da414f

From 2fcd582490a1e317218db425876da2abdc7fd302 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 23:41:01 +0000
Subject: [PATCH 24/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 5dfb771..7648156 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -88,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Mon Jun 10 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.15-1
 - New upstream release.
   Resolves: rhbz#2291030

From dead9f70bebf2935d86641a21205240ae7cbbaac Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 23 Jul 2024 17:47:45 +0900
Subject: [PATCH 25/28] ci: Use tmt based test cases

---
 .fmf/version         |  1 +
 plans/basic.fmf      | 11 +++++++++++
 tests/basic/main.fmf |  3 +++
 tests/basic/test.sh  | 31 +++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 .fmf/version
 create mode 100644 plans/basic.fmf
 create mode 100644 tests/basic/main.fmf
 create mode 100755 tests/basic/test.sh

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..4d7984e
--- /dev/null
+++ b/plans/basic.fmf
@@ -0,0 +1,11 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+    dist-git-source: true
+prepare:
+    name: tmt
+    how: install
+    package:
+      - fribidi
+execute:
+    how: tmt
diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf
new file mode 100644
index 0000000..4b2193c
--- /dev/null
+++ b/tests/basic/main.fmf
@@ -0,0 +1,3 @@
+summary: Basic test
+test: ./test.sh
+framework: beakerlib
diff --git a/tests/basic/test.sh b/tests/basic/test.sh
new file mode 100755
index 0000000..3156eac
--- /dev/null
+++ b/tests/basic/test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
+        rlRun "pushd $tmp"
+        rlRun "set -o pipefail"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "BUILD_PATH=$(rpm -q --qf '%{NAME}-%{VERSION}' fribidi)" 0 "Get the build path"
+        if test -d $TMT_SOURCE_DIR/$BUILD_PATH; then
+            for f in $TMT_SOURCE_DIR/$BUILD_PATH/test/*.input; do
+                ref=${f/.input/.reference}
+                cs=$(echo $f|cut -d_ -f2)
+                name=$(basename $f)
+                rlRun "fribidi -t -c $cs $f | tee output" 0 "Check $name for $cs"
+                rlRun "diff -U 0 output $ref" 0 "Check diff for $name"
+            done
+        else
+            rlDie "No build directory"
+        fi
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $tmp" 0 "Remove tmp directory"
+    rlPhaseEnd
+rlJournalEnd

From 00084b821d522b0ab81a03413fc974d745fa0ba4 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 27 Sep 2024 16:27:31 +0900
Subject: [PATCH 26/28] New upstream release.

  Resolves: rhbz#2314907
---
 .gitignore   | 1 +
 fribidi.spec | 8 ++++++--
 sources      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 70db7cf..99a12dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /fribidi-1.0.13.tar.xz
 /fribidi-1.0.14.tar.xz
 /fribidi-1.0.15.tar.xz
+/fribidi-1.0.16.tar.xz
diff --git a/fribidi.spec b/fribidi.spec
index 7648156..3cf87da 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.15
-Release: 2%{?dist}
+Version: 1.0.16
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -88,6 +88,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Fri Sep 27 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.16-1
+- New upstream release.
+  Resolves: rhbz#2314907
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
diff --git a/sources b/sources
index 312ef7e..173f0f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.15.tar.xz) = 98295f1a7203f401d63cc1da7cce3be6975729055fea54640d25cf05a6e6bc27d2e1a3f8edd1ddf4c7fc5ff6f7f1e2daf2bf86683d4aed5988ade8bfa5da414f
+SHA512 (fribidi-1.0.16.tar.xz) = e3a56f36155f6813e3609473639fc533de742309f561c463012dc90b412a1ac7694b765d92669b2cbfaee973ca0e92fa5e926e68a1a078921f26ef17d82ab651

From 6c209994d26072d0c67f3f27109a78ff8b75be72 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 18:52:41 +0000
Subject: [PATCH 27/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 3cf87da..367cdca 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -88,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Fri Sep 27 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.16-1
 - New upstream release.
   Resolves: rhbz#2314907

From daca1c74f10105472f1a98839fd71ca394e4a87a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 20:49:20 +0000
Subject: [PATCH 28/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 367cdca..91570fa 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPL-2.1-or-later AND Unicode-DFS-2016
@@ -88,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild