From f63aac9b6cd70eef5b93bb2a25b392c97e8ed195 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 23:16:30 +0000
Subject: [PATCH 01/85] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 741bd42..692b4ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: fribidi
-# $Id: Makefile,v 1.1 2004/09/09 04:52:46 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:46:12 notting Exp $
 NAME := fribidi
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 4e3e559c8291e71383d3ba410a36331be8b6c5e9 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:30:50 +0000
Subject: [PATCH 02/85] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 741bd42..692b4ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: fribidi
-# $Id: Makefile,v 1.1 2004/09/09 04:52:46 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:46:12 notting Exp $
 NAME := fribidi
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 9f35fb74029331bfd135f89647b609c61885a5c5 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Thu, 8 Jul 2010 01:23:22 +0000
Subject: [PATCH 03/85] Initialize branch EL-6 for fribidi

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..46381b9
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-6

From e37627ee997bf7f18c9f7faed9d9d2a4ee6cf60f Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Thu, 8 Jul 2010 11:24:59 +0000
Subject: [PATCH 04/85] Adjust CFLAGS for compiling fribidi on EL-5

---
 fribidi.spec | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fribidi.spec b/fribidi.spec
index ce22fa0..d12dd17 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -28,9 +28,18 @@ FriBidi.
 %setup -q
 
 %build
+%if 0%{?el5}
+# FORTIFY_SOURCE=2 breaks EL-5 build
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|'`
+%ifarch ppc ppc64 x86_64
+export CFLAGS="$CFLAGS -DPAGE_SIZE=4096"
+%endif
+%else
+# outside of EL-5, only ppc* needs modification
 %ifarch ppc ppc64
 export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
+%endif
 %configure --disable-static
 make %{?_smp_mflags}
 

From 97166854387f11ba69da4cf547c616e412cdbac3 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Thu, 8 Jul 2010 11:24:59 +0000
Subject: [PATCH 05/85] Adjust CFLAGS for compiling fribidi on EL-5

---
 fribidi.spec | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fribidi.spec b/fribidi.spec
index ce22fa0..d12dd17 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -28,9 +28,18 @@ FriBidi.
 %setup -q
 
 %build
+%if 0%{?el5}
+# FORTIFY_SOURCE=2 breaks EL-5 build
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|'`
+%ifarch ppc ppc64 x86_64
+export CFLAGS="$CFLAGS -DPAGE_SIZE=4096"
+%endif
+%else
+# outside of EL-5, only ppc* needs modification
 %ifarch ppc ppc64
 export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
+%endif
 %configure --disable-static
 make %{?_smp_mflags}
 

From 38ac4dc3bac2da6937d9ea4ec2d5a14c1923863b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 14:49:25 +0000
Subject: [PATCH 06/85] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 692b4ec..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: fribidi
-# $Id: Makefile,v 1.2 2007/10/15 18:46:12 notting Exp $
-NAME := fribidi
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From a282e39037b5c49e4c550506e57fc75f01369ed0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 14:49:28 +0000
Subject: [PATCH 07/85] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 692b4ec..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: fribidi
-# $Id: Makefile,v 1.2 2007/10/15 18:46:12 notting Exp $
-NAME := fribidi
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 46381b9..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-6

From 98e4af428ecb4b0c584be7cd2f9a21c0a4325ea2 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 8 Feb 2011 15:47:01 -0600
Subject: [PATCH 08/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index d12dd17..9590162 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fribidi.org
 Source0: http://fribidi.org/download/%{name}-%{version}.tar.gz
 License: LGPLv2+
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 9356ede7565c12d9102749903e2ddf7825e9f4dd Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 12 Jan 2012 20:45:49 -0600
Subject: [PATCH 09/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 9590162..db8c683 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fribidi.org
 Source0: http://fribidi.org/download/%{name}-%{version}.tar.gz
 License: LGPLv2+
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 2e6b928cb344e0d3c64482d6b8807ca2c3edbfc1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 18 Jul 2012 22:20:58 -0500
Subject: [PATCH 10/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index db8c683..49762b0 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://fribidi.org
 Source0: http://fribidi.org/download/%{name}-%{version}.tar.gz
 License: LGPLv2+
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From b94f6d24457db1bc46b5a7fa892087ce8ec973cf Mon Sep 17 00:00:00 2001
From: Parag Nemade <panemade@gmail.com>
Date: Tue, 16 Oct 2012 11:20:50 +0530
Subject: [PATCH 11/85] spec cleanup for changed packaging guidelines

---
 fribidi.spec | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/fribidi.spec b/fribidi.spec
index 49762b0..9c21cf8 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,13 +1,11 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://fribidi.org
 Source0: http://fribidi.org/download/%{name}-%{version}.tar.gz
 License: LGPLv2+
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake, autoconf, libtool, pkgconfig
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -17,8 +15,7 @@ is always written in logical order.
 %package devel
 Summary: Libraries and include files for FriBidi
 Group: System Environment/Libraries
-Requires: %name = %{version}-%{release}
-Requires: pkgconfig
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Include files and libraries needed for developing applications which use
@@ -44,32 +41,29 @@ export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc README AUTHORS COPYING ChangeLog THANKS NEWS TODO
 %{_bindir}/fribidi
 %{_libdir}/libfribidi.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/fribidi
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Tue Oct 16 2012 Parag Nemade <paragn AT fedoraproject DOT org> - 0.19.2-6
+- spec cleanup for changed packaging guidelines
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From d0414c304a2090d44b6d09abe35ea8b4bf27daf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 27 Nov 2012 14:53:38 +0000
Subject: [PATCH 12/85] Resolves: rhbz#880490 bump to latest version

---
 .gitignore   |  2 +-
 fribidi.spec | 11 +++++++----
 sources      |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index cedd181..23a3bb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-fribidi-0.19.2.tar.gz
+/fribidi-0.19.4.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index 9c21cf8..9243e14 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,10 +1,10 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 0.19.2
-Release: 6%{?dist}
+Version: 0.19.4
+Release: 1%{?dist}
 URL: http://fribidi.org
-Source0: http://fribidi.org/download/%{name}-%{version}.tar.gz
-License: LGPLv2+
+Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
+License: LGPLv2+ and UCD
 Group: System Environment/Libraries
 
 %description
@@ -61,6 +61,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Tue Nov 27 2012 Caolán McNamara <caolanm@redhat.com> - 0.19.4-1
+- Resolves: rhbz#880490 bump to latest version
+
 * Tue Oct 16 2012 Parag Nemade <paragn AT fedoraproject DOT org> - 0.19.2-6
 - spec cleanup for changed packaging guidelines
 
diff --git a/sources b/sources
index 8c2eb9e..0e272be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-626db17d2d99b43615ad9d12500f568a  fribidi-0.19.2.tar.gz
+0173f98ff929782d45819fc4a813c175  fribidi-0.19.4.tar.bz2

From 089716e6089ca8bd695d7763c625cb1117e59a61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 10 Dec 2012 11:46:58 +0000
Subject: [PATCH 13/85] Resolves: rhbz#884000 signed warning (thanks mfabian)

---
 fribidi.spec        |  7 ++++++-
 signedwarning.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 signedwarning.patch

diff --git a/fribidi.spec b/fribidi.spec
index 9243e14..842b471 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,11 +1,12 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 Group: System Environment/Libraries
+Patch0: signedwarning.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -23,6 +24,7 @@ FriBidi.
 
 %prep
 %setup -q
+%patch0 -p1 -b .signedwarnings
 
 %build
 %if 0%{?el5}
@@ -61,6 +63,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Mon Dec 10 2012 Caolán McNamara <caolanm@redhat.com> - 0.19.4-2
+- Resolves: rhbz#884000 signed warning (thanks mfabian)
+
 * Tue Nov 27 2012 Caolán McNamara <caolanm@redhat.com> - 0.19.4-1
 - Resolves: rhbz#880490 bump to latest version
 
diff --git a/signedwarning.patch b/signedwarning.patch
new file mode 100644
index 0000000..06ae0ef
--- /dev/null
+++ b/signedwarning.patch
@@ -0,0 +1,11 @@
+--- fribidi-0.19.4/bin/fribidi-main.c	2012-08-25 20:56:20.000000000 +0200
++++ fribidi-0.19.4/bin/fribidi-main.c	2012-12-06 16:10:38.936894816 +0100
+@@ -519,7 +519,7 @@ 
+ 				  idx++;
+ 				}
+ #endif /* !FRIBIDI_MAIN_USE_ICONV_H */
+-			    if (wid < 0 && idx > st + 1)
++			    if (wid < 0 && idx - st > 1)
+ 			      idx--;
+ 			    inlen = idx - st;
+ 

From 9265be8d3fc4c5c079a70f4ea53ee1cfcb45ee39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 13 Feb 2013 13:09:20 +0000
Subject: [PATCH 14/85] Resolves: rhbz#884000 remove empty man pages

---
 fribidi.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fribidi.spec b/fribidi.spec
index 842b471..fa4ef06 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -44,8 +44,9 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
-
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# remove empty (compressed) man pages
+find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 
 %post -p /sbin/ldconfig
 
@@ -63,6 +64,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Feb 18 2013 Caolán McNamara <caolanm@redhat.com> - 0.19.4-3
+- Resolves: rhbz#884000 remove empty man pages
+
 * Mon Dec 10 2012 Caolán McNamara <caolanm@redhat.com> - 0.19.4-2
 - Resolves: rhbz#884000 signed warning (thanks mfabian)
 

From 4a39165a4b1954ff8f3e8ef0826f4c0b65464d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 3 Apr 2013 08:59:55 +0100
Subject: [PATCH 15/85] Resolves: rhbz#925368 support aarch64

---
 fribidi-aarch64.patch | 1348 +++++++++++++++++++++++++++++++++++++++++
 fribidi.spec          |    7 +-
 2 files changed, 1354 insertions(+), 1 deletion(-)
 create mode 100644 fribidi-aarch64.patch

diff --git a/fribidi-aarch64.patch b/fribidi-aarch64.patch
new file mode 100644
index 0000000..c91047e
--- /dev/null
+++ b/fribidi-aarch64.patch
@@ -0,0 +1,1348 @@
+diff -urN fribidi-0.19.4/config.guess fribidi-0.19.4-aarch64/config.guess
+--- fribidi-0.19.4/config.guess	2012-08-25 16:40:38.000000000 -0500
++++ fribidi-0.19.4-aarch64/config.guess	2013-03-03 04:48:11.611623841 -0600
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-#   Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2009-06-10'
++timestamp='2012-09-25'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,9 +17,7 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -27,16 +25,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,8 +54,9 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -144,7 +143,7 @@
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+@@ -180,7 +179,7 @@
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -201,6 +200,10 @@
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
++	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+@@ -223,7 +226,7 @@
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -269,7 +272,10 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit ;;
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+@@ -295,12 +301,12 @@
+ 	echo s390-ibm-zvmoe
+ 	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
++	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+-    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -333,6 +339,9 @@
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	eval $set_cc_for_build
+ 	SUN_ARCH="i386"
+@@ -391,23 +400,23 @@
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit ;;
++	exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit ;;
+@@ -477,8 +486,8 @@
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
+     AViiON:dgux:*:*)
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -491,7 +500,7 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit ;;
++	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit ;;
+@@ -548,7 +557,7 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit ;;
+-    *:AIX:*:[456])
++    *:AIX:*:[4567])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -591,52 +600,52 @@
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH="hppa2.0n" ;;
++			  64) HP_ARCH="hppa2.0w" ;;
+ 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
++
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
++
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+ 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -727,22 +736,22 @@
+ 	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit ;;
++	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit ;;
++	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit ;;
++	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit ;;
++	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit ;;
++	exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+@@ -766,14 +775,14 @@
+ 	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit ;;
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     5000:UNIX_System_V:4.*:*)
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -785,34 +794,39 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	case ${UNAME_MACHINE} in
+-	    pc98)
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
+ 	    amd64)
+ 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    *)
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     i*:windows32*:*)
+-    	# uname -m includes "-pc" on this system.
+-    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
+ 	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    *:Interix*:[3456]*)
+-    	case ${UNAME_MACHINE} in
++    *:Interix*:*)
++	case ${UNAME_MACHINE} in
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd | genuineintel)
++	    authenticamd | genuineintel | EM64T)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+@@ -854,6 +868,27 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++	esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -861,20 +896,40 @@
+ 	then
+ 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	else
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-gnu
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -901,39 +956,18 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+-	echo or32-unknown-linux-gnu
+-	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+-	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+-	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+ 	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -942,14 +976,17 @@
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -957,67 +994,18 @@
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
++    tile*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     vax:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-dec-linux-gnu
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+@@ -1025,11 +1013,11 @@
+ 	echo i386-sequent-sysv4
+ 	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit ;;
+     i*86:OS/2:*:*)
+@@ -1061,7 +1049,7 @@
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+@@ -1089,13 +1077,13 @@
+ 	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i586.
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
+ 	# Note: whatever this is, it MUST be the same as what config.sub
+ 	# prints for the "djgpp" host, or else GDB configury will decide that
+ 	# this is a cross-build.
+ 	echo i586-pc-msdosdjgpp
+-        exit ;;
++	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit ;;
+@@ -1130,8 +1118,8 @@
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
+     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ 	OS_REL='.3'
+ 	test -r /etc/.relid \
+@@ -1174,10 +1162,10 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+@@ -1203,11 +1191,11 @@
+ 	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+-	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit ;;
++	exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit ;;
+@@ -1220,6 +1208,9 @@
+     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+ 	echo i586-pc-haiku
+ 	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1247,6 +1238,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1262,7 +1263,10 @@
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit ;;
+-    NSE-?:NONSTOP_KERNEL:*:*)
++    NEO-?:NONSTOP_KERNEL:*:*)
++	echo neo-tandem-nsk${UNAME_RELEASE}
++	exit ;;
++    NSE-*:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1307,13 +1311,13 @@
+ 	echo pdp10-unknown-its
+ 	exit ;;
+     SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit ;;
+     *:*VMS:*:*)
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+@@ -1331,11 +1335,11 @@
+     i*86:AROS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-aros
+ 	exit ;;
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
++	exit ;;
+ esac
+ 
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+ eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+@@ -1353,11 +1357,11 @@
+ #include <sys/param.h>
+   printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+-          "4"
++	"4"
+ #else
+-	  ""
++	""
+ #endif
+-         ); exit (0);
++	); exit (0);
+ #endif
+ #endif
+ 
+diff -urN fribidi-0.19.4/config.sub fribidi-0.19.4-aarch64/config.sub
+--- fribidi-0.19.4/config.sub	2012-08-25 16:40:38.000000000 -0500
++++ fribidi-0.19.4-aarch64/config.sub	2013-03-03 04:48:11.659618287 -0600
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-#   Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++#   2011, 2012 Free Software Foundation, Inc.
+ 
+-timestamp='2009-06-11'
++timestamp='2012-10-10'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,9 +21,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -32,13 +30,16 @@
+ 
+ 
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +73,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -120,13 +122,18 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
++  android-linux)
++    os=-linux-android
++    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++    ;;
+   *)
+     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+     if [ $basic_machine != $1 ]
+@@ -149,12 +156,12 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze*)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+-        -bluegene*)
+-	        os=-cnk
++	-bluegene*)
++		os=-cnk
+ 		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+@@ -170,10 +177,10 @@
+ 		os=-chorusos
+ 		basic_machine=$1
+ 		;;
+- 	-chorusrdb)
+- 		os=-chorusrdb
++	-chorusrdb)
++		os=-chorusrdb
+ 		basic_machine=$1
+- 		;;
++		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+@@ -218,6 +225,12 @@
+ 	-isc*)
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-lynx*178)
++		os=-lynxos178
++		;;
++	-lynx*5)
++		os=-lynxos5
++		;;
+ 	-lynx*)
+ 		os=-lynxos
+ 		;;
+@@ -242,20 +255,25 @@
+ 	# Some are omitted here because they have special meanings below.
+ 	1750a | 580 \
+ 	| a29k \
++	| aarch64 | aarch64_be \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++        | be32 | be64 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
++	| epiphany \
+ 	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| hexagon \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
++	| le32 | le64 \
+ 	| lm32 \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+-	| maxq | mb | microblaze | mcore | mep | metag \
++	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+@@ -278,27 +296,39 @@
+ 	| moxie \
+ 	| mt \
+ 	| msp430 \
++	| nds32 | nds32le | nds32be \
+ 	| nios | nios2 \
+ 	| ns16k | ns32k \
++	| open8 \
+ 	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| powerpc | powerpc64 | powerpc64le | powerpcle \
+ 	| pyramid \
++	| rl78 | rx \
+ 	| score \
+ 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+-	| spu | strongarm \
+-	| tahoe | thumb | tic4x | tic80 | tron \
+-	| v850 | v850e \
++	| spu \
++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++	| ubicom32 \
++	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ 	| we32k \
+-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| x86 | xc16x | xstormy16 | xtensa \
+ 	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
+-		# Motorola 68HC11/12.
++	c54x)
++		basic_machine=tic54x-unknown
++		;;
++	c55x)
++		basic_machine=tic55x-unknown
++		;;
++	c6x)
++		basic_machine=tic6x-unknown
++		;;
++	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+@@ -308,6 +338,21 @@
+ 		basic_machine=mt-unknown
+ 		;;
+ 
++	strongarm | thumb | xscale)
++		basic_machine=arm-unknown
++		;;
++	xgate)
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	xscaleeb)
++		basic_machine=armeb-unknown
++		;;
++
++	xscaleel)
++		basic_machine=armel-unknown
++		;;
++
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+@@ -322,25 +367,30 @@
+ 	# Recognize the basic CPU types with company name.
+ 	580-* \
+ 	| a29k-* \
++	| aarch64-* | aarch64_be-* \
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* | avr32-* \
++	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
+-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| hexagon-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
++	| le32-* | le64-* \
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| microblaze-* | microblazeel-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+@@ -362,24 +412,29 @@
+ 	| mmix-* \
+ 	| mt-* \
+ 	| msp430-* \
++	| nds32-* | nds32le-* | nds32be-* \
+ 	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
++	| open8-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
++	| rl78-* | romp-* | rs6000-* | rx-* \
+ 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* \
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| tahoe-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile*-* \
+ 	| tron-* \
+-	| v850-* | v850e-* | vax-* \
++	| ubicom32-* \
++	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++	| vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* \
+ 	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+ 	| z8k-* | z80-*)
+@@ -404,7 +459,7 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
+-    	abacus)
++	abacus)
+ 		basic_machine=abacus-unknown
+ 		;;
+ 	adobe68k)
+@@ -474,11 +529,20 @@
+ 		basic_machine=powerpc-ibm
+ 		os=-cnk
+ 		;;
++	c54x-*)
++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c55x-*)
++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	c6x-*)
++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
+-        cegcc)
++	cegcc)
+ 		basic_machine=arm-unknown
+ 		os=-cegcc
+ 		;;
+@@ -510,7 +574,7 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16)
++	cr16 | cr16-*)
+ 		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+@@ -668,7 +732,6 @@
+ 	i370-ibm* | ibm*)
+ 		basic_machine=i370-ibm
+ 		;;
+-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+ 	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+@@ -726,6 +789,13 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	microblaze*)
++		basic_machine=microblaze-xilinx
++		;;
++	mingw64)
++		basic_machine=x86_64-pc
++		os=-mingw64
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+@@ -762,10 +832,18 @@
+ 	ms1-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ 		;;
++	msys)
++		basic_machine=i386-pc
++		os=-msys
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+ 		;;
++	nacl)
++		basic_machine=le32-unknown
++		os=-nacl
++		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+@@ -830,6 +908,12 @@
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	neo-tandem)
++		basic_machine=neo-tandem
++		;;
++	nse-tandem)
++		basic_machine=nse-tandem
++		;;
+ 	nsr-tandem)
+ 		basic_machine=nsr-tandem
+ 		;;
+@@ -912,9 +996,10 @@
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+-	ppc)	basic_machine=powerpc-unknown
++	ppc | ppcbe)	basic_machine=powerpc-unknown
+ 		;;
+-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc-* | ppcbe-*)
++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+@@ -1008,6 +1093,9 @@
+ 		basic_machine=i860-stratus
+ 		os=-sysv4
+ 		;;
++	strongarm-* | thumb-*)
++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -1064,20 +1152,8 @@
+ 		basic_machine=t90-cray
+ 		os=-unicos
+ 		;;
+-	tic54x | c54x*)
+-		basic_machine=tic54x-unknown
+-		os=-coff
+-		;;
+-	tic55x | c55x*)
+-		basic_machine=tic55x-unknown
+-		os=-coff
+-		;;
+-	tic6x | c6x*)
+-		basic_machine=tic6x-unknown
+-		os=-coff
+-		;;
+ 	tile*)
+-		basic_machine=tile-unknown
++		basic_machine=$basic_machine-unknown
+ 		os=-linux-gnu
+ 		;;
+ 	tx39)
+@@ -1147,6 +1223,9 @@
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	xscale-* | xscalee[bl]-*)
++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++		;;
+ 	ymp)
+ 		basic_machine=ymp-cray
+ 		os=-unicos
+@@ -1244,9 +1323,12 @@
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+-        # First match some system type aliases
+-        # that might get confused with valid system types.
++	# First match some system type aliases
++	# that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++	-auroraux)
++		os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1268,21 +1350,22 @@
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+-	      | -kopensolaris* \
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+-	      | -openbsd* | -solidbsd* \
++	      | -bitrig* | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+@@ -1290,7 +1373,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1329,7 +1412,7 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
+-        -os400*)
++	-os400*)
+ 		os=-os400
+ 		;;
+ 	-wince*)
+@@ -1378,7 +1461,7 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
+-        -tpf*)
++	-tpf*)
+ 		os=-tpf
+ 		;;
+ 	-triton*)
+@@ -1423,6 +1506,8 @@
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++	-nacl*)
++		;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -1445,10 +1530,10 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
+-        score-*)
++	score-*)
+ 		os=-elf
+ 		;;
+-        spu-*)
++	spu-*)
+ 		os=-elf
+ 		;;
+ 	*-acorn)
+@@ -1460,8 +1545,20 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-        c4x-* | tic4x-*)
+-        	os=-coff
++	c4x-* | tic4x-*)
++		os=-coff
++		;;
++	hexagon-*)
++		os=-elf
++		;;
++	tic54x-*)
++		os=-coff
++		;;
++	tic55x-*)
++		os=-coff
++		;;
++	tic6x-*)
++		os=-coff
+ 		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+@@ -1481,14 +1578,11 @@
+ 		;;
+ 	m68000-sun)
+ 		os=-sunos3
+-		# This also exists in the configure program, but was not the
+-		# default.
+-		# os=-sunos4
+ 		;;
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
+-        mep-*)
++	mep-*)
+ 		os=-elf
+ 		;;
+ 	mips*-cisco)
+@@ -1515,7 +1609,7 @@
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+-    	*-knuth)
++	*-knuth)
+ 		os=-mmixware
+ 		;;
+ 	*-wec)
diff --git a/fribidi.spec b/fribidi.spec
index fa4ef06..92fe739 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,12 +1,13 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 Group: System Environment/Libraries
 Patch0: signedwarning.patch
+Patch1: fribidi-aarch64.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -25,6 +26,7 @@ FriBidi.
 %prep
 %setup -q
 %patch0 -p1 -b .signedwarnings
+%patch1 -p1 -b .aarch64
 
 %build
 %if 0%{?el5}
@@ -64,6 +66,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Apr 03 2013 Caolán McNamara <caolanm@redhat.com> - 0.19.4-4
+- Resolves: rhbz#925368 support aarch64
+
 * Wed Feb 18 2013 Caolán McNamara <caolanm@redhat.com> - 0.19.4-3
 - Resolves: rhbz#884000 remove empty man pages
 

From 85051a496a110dfa09bec9cb2db6094756867b54 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 3 Aug 2013 07:00:16 -0500
Subject: [PATCH 16/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 92fe739..a7801ce 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -66,6 +66,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Wed Apr 03 2013 Caolán McNamara <caolanm@redhat.com> - 0.19.4-4
 - Resolves: rhbz#925368 support aarch64
 

From 4beaa9801592dc23ef39d1efe72e381f92fa1521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 13 Jan 2014 13:07:11 +0000
Subject: [PATCH 17/85] Resolves: rhbz#1052148 latest fribidi

---
 .gitignore            |    2 +-
 fribidi-aarch64.patch | 1348 -----------------------------------------
 fribidi.spec          |   15 +-
 signedwarning.patch   |   11 -
 sources               |    2 +-
 5 files changed, 10 insertions(+), 1368 deletions(-)
 delete mode 100644 fribidi-aarch64.patch
 delete mode 100644 signedwarning.patch

diff --git a/.gitignore b/.gitignore
index 23a3bb0..5697655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/fribidi-0.19.4.tar.bz2
+/fribidi-0.19.6.tar.bz2
diff --git a/fribidi-aarch64.patch b/fribidi-aarch64.patch
deleted file mode 100644
index c91047e..0000000
--- a/fribidi-aarch64.patch
+++ /dev/null
@@ -1,1348 +0,0 @@
-diff -urN fribidi-0.19.4/config.guess fribidi-0.19.4-aarch64/config.guess
---- fribidi-0.19.4/config.guess	2012-08-25 16:40:38.000000000 -0500
-+++ fribidi-0.19.4-aarch64/config.guess	2013-03-03 04:48:11.611623841 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
--#   Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2011, 2012 Free Software Foundation, Inc.
- 
--timestamp='2009-06-10'
-+timestamp='2012-09-25'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,9 +17,7 @@
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -27,16 +25,16 @@
- # the same distribution terms that you use for the rest of that program.
- 
- 
--# Originally written by Per Bothner <per@bothner.com>.
--# Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -56,8 +54,9 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-+Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -144,7 +143,7 @@
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-     *:NetBSD:*:*)
- 	# NetBSD (nbsd) targets should (where applicable) match one or
--	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
- 	# switched to ELF, *-*-netbsd* would select the old
- 	# object file format.  This provides both forward
-@@ -180,7 +179,7 @@
- 		fi
- 		;;
- 	    *)
--	        os=netbsd
-+		os=netbsd
- 		;;
- 	esac
- 	# The OS release
-@@ -201,6 +200,10 @@
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
- 	exit ;;
-+    *:Bitrig:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+	exit ;;
-     *:OpenBSD:*:*)
- 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -223,7 +226,7 @@
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- 		;;
- 	*5.*)
--	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- 		;;
- 	esac
- 	# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -269,7 +272,10 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit ;;
-+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+	exitcode=$?
-+	trap '' 0
-+	exit $exitcode ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
-@@ -295,12 +301,12 @@
- 	echo s390-ibm-zvmoe
- 	exit ;;
-     *:OS400:*:*)
--        echo powerpc-ibm-os400
-+	echo powerpc-ibm-os400
- 	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
- 	exit ;;
--    arm:riscos:*:*|arm:RISCOS:*:*)
-+    arm*:riscos:*:*|arm*:RISCOS:*:*)
- 	echo arm-unknown-riscos
- 	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -333,6 +339,9 @@
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
-+	exit ;;
-     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- 	eval $set_cc_for_build
- 	SUN_ARCH="i386"
-@@ -391,23 +400,23 @@
-     # MiNT.  But MiNT is downward compatible to TOS, so this should
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint${UNAME_RELEASE}
- 	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit ;;
-+	exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint${UNAME_RELEASE}
- 	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
--        echo m68k-milan-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-milan-mint${UNAME_RELEASE}
-+	exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
--        echo m68k-hades-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-hades-mint${UNAME_RELEASE}
-+	exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
--        echo m68k-unknown-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-unknown-mint${UNAME_RELEASE}
-+	exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
- 	exit ;;
-@@ -477,8 +486,8 @@
- 	echo m88k-motorola-sysv3
- 	exit ;;
-     AViiON:dgux:*:*)
--        # DG/UX returns AViiON for all architectures
--        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	# DG/UX returns AViiON for all architectures
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
- 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- 	then
- 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -491,7 +500,7 @@
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit ;;
-+	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
- 	exit ;;
-@@ -548,7 +557,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[456])
-+    *:AIX:*:[4567])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -591,52 +600,52 @@
- 	    9000/[678][0-9][0-9])
- 		if [ -x /usr/bin/getconf ]; then
- 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
--                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
--                    case "${sc_cpu_version}" in
--                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
--                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
--                      532)                      # CPU_PA_RISC2_0
--                        case "${sc_kernel_bits}" in
--                          32) HP_ARCH="hppa2.0n" ;;
--                          64) HP_ARCH="hppa2.0w" ;;
-+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+		    case "${sc_cpu_version}" in
-+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+		      532)                      # CPU_PA_RISC2_0
-+			case "${sc_kernel_bits}" in
-+			  32) HP_ARCH="hppa2.0n" ;;
-+			  64) HP_ARCH="hppa2.0w" ;;
- 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
--                        esac ;;
--                    esac
-+			esac ;;
-+		    esac
- 		fi
- 		if [ "${HP_ARCH}" = "" ]; then
- 		    eval $set_cc_for_build
--		    sed 's/^              //' << EOF >$dummy.c
-+		    sed 's/^		//' << EOF >$dummy.c
-+
-+		#define _HPUX_SOURCE
-+		#include <stdlib.h>
-+		#include <unistd.h>
-+
-+		int main ()
-+		{
-+		#if defined(_SC_KERNEL_BITS)
-+		    long bits = sysconf(_SC_KERNEL_BITS);
-+		#endif
-+		    long cpu  = sysconf (_SC_CPU_VERSION);
- 
--              #define _HPUX_SOURCE
--              #include <stdlib.h>
--              #include <unistd.h>
--
--              int main ()
--              {
--              #if defined(_SC_KERNEL_BITS)
--                  long bits = sysconf(_SC_KERNEL_BITS);
--              #endif
--                  long cpu  = sysconf (_SC_CPU_VERSION);
--
--                  switch (cpu)
--              	{
--              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
--              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
--              	case CPU_PA_RISC2_0:
--              #if defined(_SC_KERNEL_BITS)
--              	    switch (bits)
--              		{
--              		case 64: puts ("hppa2.0w"); break;
--              		case 32: puts ("hppa2.0n"); break;
--              		default: puts ("hppa2.0"); break;
--              		} break;
--              #else  /* !defined(_SC_KERNEL_BITS) */
--              	    puts ("hppa2.0"); break;
--              #endif
--              	default: puts ("hppa1.0"); break;
--              	}
--                  exit (0);
--              }
-+		    switch (cpu)
-+			{
-+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+			case CPU_PA_RISC2_0:
-+		#if defined(_SC_KERNEL_BITS)
-+			    switch (bits)
-+				{
-+				case 64: puts ("hppa2.0w"); break;
-+				case 32: puts ("hppa2.0n"); break;
-+				default: puts ("hppa2.0"); break;
-+				} break;
-+		#else  /* !defined(_SC_KERNEL_BITS) */
-+			    puts ("hppa2.0"); break;
-+		#endif
-+			default: puts ("hppa1.0"); break;
-+			}
-+		    exit (0);
-+		}
- EOF
- 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- 		    test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -727,22 +736,22 @@
- 	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit ;;
-+	exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit ;;
-+	exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit ;;
-+	exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit ;;
-+	exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit ;;
-+	exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-@@ -766,14 +775,14 @@
- 	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
--        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit ;;
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-     5000:UNIX_System_V:4.*:*)
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
--        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- 	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -785,34 +794,39 @@
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- 	exit ;;
-     *:FreeBSD:*:*)
--	case ${UNAME_MACHINE} in
--	    pc98)
--		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	case ${UNAME_PROCESSOR} in
- 	    amd64)
- 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- 	    *)
--		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- 	esac
- 	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
-+    *:MINGW64*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw64
-+	exit ;;
-     *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-+    i*:MSYS*:*)
-+	echo ${UNAME_MACHINE}-pc-msys
-+	exit ;;
-     i*:windows32*:*)
--    	# uname -m includes "-pc" on this system.
--    	echo ${UNAME_MACHINE}-mingw32
-+	# uname -m includes "-pc" on this system.
-+	echo ${UNAME_MACHINE}-mingw32
- 	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit ;;
--    *:Interix*:[3456]*)
--    	case ${UNAME_MACHINE} in
-+    *:Interix*:*)
-+	case ${UNAME_MACHINE} in
- 	    x86)
- 		echo i586-pc-interix${UNAME_RELEASE}
- 		exit ;;
--	    EM64T | authenticamd | genuineintel)
-+	    authenticamd | genuineintel | EM64T)
- 		echo x86_64-unknown-interix${UNAME_RELEASE}
- 		exit ;;
- 	    IA64)
-@@ -854,6 +868,27 @@
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-+    aarch64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    aarch64_be:Linux:*:*)
-+	UNAME_MACHINE=aarch64_be
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+	esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-     arm*:Linux:*:*)
- 	eval $set_cc_for_build
- 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-@@ -861,20 +896,40 @@
- 	then
- 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	else
--	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+		| grep -q __ARM_PCS_VFP
-+	    then
-+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	    else
-+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+	    fi
- 	fi
- 	exit ;;
-     avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     cris:Linux:*:*)
--	echo cris-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-gnu
- 	exit ;;
-     crisv32:Linux:*:*)
--	echo crisv32-axis-linux-gnu
-+	echo ${UNAME_MACHINE}-axis-linux-gnu
- 	exit ;;
-     frv:Linux:*:*)
--    	echo frv-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    hexagon:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -901,39 +956,18 @@
- 	#endif
- 	#endif
- EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     or32:Linux:*:*)
--	echo or32-unknown-linux-gnu
--	exit ;;
--    ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
--	exit ;;
--    ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
--	exit ;;
--    alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
--	  EV5)   UNAME_MACHINE=alphaev5 ;;
--	  EV56)  UNAME_MACHINE=alphaev56 ;;
--	  PCA56) UNAME_MACHINE=alphapca56 ;;
--	  PCA57) UNAME_MACHINE=alphapca56 ;;
--	  EV6)   UNAME_MACHINE=alphaev6 ;;
--	  EV67)  UNAME_MACHINE=alphaev67 ;;
--	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
--	objdump --private-headers /bin/sh | grep -q ld.so.1
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     padre:Linux:*:*)
- 	echo sparc-unknown-linux-gnu
- 	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -942,14 +976,17 @@
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
- 	exit ;;
--    parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
- 	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit ;;
-     sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -957,67 +994,18 @@
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-+    tile*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     vax:Linux:*:*)
- 	echo ${UNAME_MACHINE}-dec-linux-gnu
- 	exit ;;
-     x86_64:Linux:*:*)
--	echo x86_64-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     xtensa*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    i*86:Linux:*:*)
--	# The BFD linker knows what the default object file format is, so
--	# first see if it will tell us. cd to the root directory to prevent
--	# problems with other programs or directories called `ld' in the path.
--	# Set LC_ALL=C to ensure ld outputs messages in English.
--	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
--			 | sed -ne '/supported targets:/!d
--				    s/[ 	][ 	]*/ /g
--				    s/.*supported targets: *//
--				    s/ .*//
--				    p'`
--        case "$ld_supported_targets" in
--	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
--		;;
--	esac
--	# Determine whether the default compiler is a.out or elf
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#ifdef __ELF__
--	# ifdef __GLIBC__
--	#  if __GLIBC__ >= 2
--	LIBC=gnu
--	#  else
--	LIBC=gnulibc1
--	#  endif
--	# else
--	LIBC=gnulibc1
--	# endif
--	#else
--	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
--	LIBC=gnu
--	#else
--	LIBC=gnuaout
--	#endif
--	#endif
--	#ifdef __dietlibc__
--	LIBC=dietlibc
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^LIBC/{
--		s: ::g
--		p
--	    }'`"
--	test x"${LIBC}" != x && {
--		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
--		exit
--	}
--	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
--	;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
-@@ -1025,11 +1013,11 @@
- 	echo i386-sequent-sysv4
- 	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
--        # Unixware is an offshoot of SVR4, but it has its own version
--        # number series starting with 2...
--        # I am not positive that other SVR4 systems won't match this,
-+	# Unixware is an offshoot of SVR4, but it has its own version
-+	# number series starting with 2...
-+	# I am not positive that other SVR4 systems won't match this,
- 	# I just have to hope.  -- rms.
--        # Use sysv4.2uw... so that sysv4* matches it.
-+	# Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- 	exit ;;
-     i*86:OS/2:*:*)
-@@ -1061,7 +1049,7 @@
- 	fi
- 	exit ;;
-     i*86:*:5:[678]*)
--    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
-@@ -1089,13 +1077,13 @@
- 	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
--        # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i586.
-+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-+	# the processor, so we play safe by assuming i586.
- 	# Note: whatever this is, it MUST be the same as what config.sub
- 	# prints for the "djgpp" host, or else GDB configury will decide that
- 	# this is a cross-build.
- 	echo i586-pc-msdosdjgpp
--        exit ;;
-+	exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
- 	exit ;;
-@@ -1130,8 +1118,8 @@
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
--        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && { echo i486-ncr-sysv4; exit; } ;;
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4; exit; } ;;
-     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- 	OS_REL='.3'
- 	test -r /etc/.relid \
-@@ -1174,10 +1162,10 @@
- 		echo ns32k-sni-sysv
- 	fi
- 	exit ;;
--    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                      # says <Richard.M.Bartel@ccMail.Census.GOV>
--        echo i586-unisys-sysv4
--        exit ;;
-+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+			# says <Richard.M.Bartel@ccMail.Census.GOV>
-+	echo i586-unisys-sysv4
-+	exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
-@@ -1203,11 +1191,11 @@
- 	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
--	        echo mips-nec-sysv${UNAME_RELEASE}
-+		echo mips-nec-sysv${UNAME_RELEASE}
- 	else
--	        echo mips-unknown-sysv${UNAME_RELEASE}
-+		echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit ;;
-+	exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
- 	exit ;;
-@@ -1220,6 +1208,9 @@
-     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
- 	echo i586-pc-haiku
- 	exit ;;
-+    x86_64:Haiku:*:*)
-+	echo x86_64-unknown-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-@@ -1247,6 +1238,16 @@
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
-+	    i386)
-+		eval $set_cc_for_build
-+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		      grep IS_64BIT_ARCH >/dev/null
-+		  then
-+		      UNAME_PROCESSOR="x86_64"
-+		  fi
-+		fi ;;
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1262,7 +1263,10 @@
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
- 	exit ;;
--    NSE-?:NONSTOP_KERNEL:*:*)
-+    NEO-?:NONSTOP_KERNEL:*:*)
-+	echo neo-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSE-*:NONSTOP_KERNEL:*:*)
- 	echo nse-tandem-nsk${UNAME_RELEASE}
- 	exit ;;
-     NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1307,13 +1311,13 @@
- 	echo pdp10-unknown-its
- 	exit ;;
-     SEI:*:*:SEIUX)
--        echo mips-sei-seiux${UNAME_RELEASE}
-+	echo mips-sei-seiux${UNAME_RELEASE}
- 	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	exit ;;
-     *:*VMS:*:*)
--    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
- 	    A*) echo alpha-dec-vms ; exit ;;
- 	    I*) echo ia64-dec-vms ; exit ;;
-@@ -1331,11 +1335,11 @@
-     i*86:AROS:*:*)
- 	echo ${UNAME_MACHINE}-pc-aros
- 	exit ;;
-+    x86_64:VMkernel:*:*)
-+	echo ${UNAME_MACHINE}-unknown-esx
-+	exit ;;
- esac
- 
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
- eval $set_cc_for_build
- cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
-@@ -1353,11 +1357,11 @@
- #include <sys/param.h>
-   printf ("m68k-sony-newsos%s\n",
- #ifdef NEWSOS4
--          "4"
-+	"4"
- #else
--	  ""
-+	""
- #endif
--         ); exit (0);
-+	); exit (0);
- #endif
- #endif
- 
-diff -urN fribidi-0.19.4/config.sub fribidi-0.19.4-aarch64/config.sub
---- fribidi-0.19.4/config.sub	2012-08-25 16:40:38.000000000 -0500
-+++ fribidi-0.19.4-aarch64/config.sub	2013-03-03 04:48:11.659618287 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
--#   Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2011, 2012 Free Software Foundation, Inc.
- 
--timestamp='2009-06-11'
-+timestamp='2012-10-10'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,9 +21,7 @@
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -32,13 +30,16 @@
- 
- 
- # Please send patches to <config-patches@gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
- 
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -72,8 +73,9 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-+Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -120,13 +122,18 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
--  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+  knetbsd*-gnu* | netbsd*-gnu* | \
-   kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-+  android-linux)
-+    os=-linux-android
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-+    ;;
-   *)
-     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-     if [ $basic_machine != $1 ]
-@@ -149,12 +156,12 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple | -axis | -knuth | -cray)
-+	-apple | -axis | -knuth | -cray | -microblaze*)
- 		os=
- 		basic_machine=$1
- 		;;
--        -bluegene*)
--	        os=-cnk
-+	-bluegene*)
-+		os=-cnk
- 		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
-@@ -170,10 +177,10 @@
- 		os=-chorusos
- 		basic_machine=$1
- 		;;
-- 	-chorusrdb)
-- 		os=-chorusrdb
-+	-chorusrdb)
-+		os=-chorusrdb
- 		basic_machine=$1
-- 		;;
-+		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-@@ -218,6 +225,12 @@
- 	-isc*)
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-lynx*178)
-+		os=-lynxos178
-+		;;
-+	-lynx*5)
-+		os=-lynxos5
-+		;;
- 	-lynx*)
- 		os=-lynxos
- 		;;
-@@ -242,20 +255,25 @@
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
- 	| a29k \
-+	| aarch64 | aarch64_be \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
- 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+        | be32 | be64 \
- 	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
-+	| epiphany \
- 	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| hexagon \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
-+	| le32 | le64 \
- 	| lm32 \
- 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
--	| maxq | mb | microblaze | mcore | mep | metag \
-+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
-@@ -278,27 +296,39 @@
- 	| moxie \
- 	| mt \
- 	| msp430 \
-+	| nds32 | nds32le | nds32be \
- 	| nios | nios2 \
- 	| ns16k | ns32k \
-+	| open8 \
- 	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
--	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle \
- 	| pyramid \
-+	| rl78 | rx \
- 	| score \
- 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
--	| spu | strongarm \
--	| tahoe | thumb | tic4x | tic80 | tron \
--	| v850 | v850e \
-+	| spu \
-+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-+	| ubicom32 \
-+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- 	| we32k \
--	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| x86 | xc16x | xstormy16 | xtensa \
- 	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m6811 | m68hc11 | m6812 | m68hc12)
--		# Motorola 68HC11/12.
-+	c54x)
-+		basic_machine=tic54x-unknown
-+		;;
-+	c55x)
-+		basic_machine=tic55x-unknown
-+		;;
-+	c6x)
-+		basic_machine=tic6x-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
- 		basic_machine=$basic_machine-unknown
- 		os=-none
- 		;;
-@@ -308,6 +338,21 @@
- 		basic_machine=mt-unknown
- 		;;
- 
-+	strongarm | thumb | xscale)
-+		basic_machine=arm-unknown
-+		;;
-+	xgate)
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	xscaleeb)
-+		basic_machine=armeb-unknown
-+		;;
-+
-+	xscaleel)
-+		basic_machine=armel-unknown
-+		;;
-+
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
-@@ -322,25 +367,30 @@
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
-+	| aarch64-* | aarch64_be-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
- 	| avr-* | avr32-* \
-+	| be32-* | be64-* \
- 	| bfin-* | bs2000-* \
--	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
- 	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
- 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| hexagon-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
-+	| le32-* | le64-* \
- 	| lm32-* \
- 	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+	| microblaze-* | microblazeel-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
-@@ -362,24 +412,29 @@
- 	| mmix-* \
- 	| mt-* \
- 	| msp430-* \
-+	| nds32-* | nds32le-* | nds32be-* \
- 	| nios-* | nios2-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| open8-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- 	| pyramid-* \
--	| romp-* | rs6000-* \
-+	| rl78-* | romp-* | rs6000-* | rx-* \
- 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
--	| tahoe-* | thumb-* \
--	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+	| tahoe-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tile*-* \
- 	| tron-* \
--	| v850-* | v850e-* | vax-* \
-+	| ubicom32-* \
-+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+	| vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* \
- 	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
- 	| z8k-* | z80-*)
-@@ -404,7 +459,7 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
--    	abacus)
-+	abacus)
- 		basic_machine=abacus-unknown
- 		;;
- 	adobe68k)
-@@ -474,11 +529,20 @@
- 		basic_machine=powerpc-ibm
- 		os=-cnk
- 		;;
-+	c54x-*)
-+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	c55x-*)
-+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	c6x-*)
-+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
--        cegcc)
-+	cegcc)
- 		basic_machine=arm-unknown
- 		os=-cegcc
- 		;;
-@@ -510,7 +574,7 @@
- 		basic_machine=craynv-cray
- 		os=-unicosmp
- 		;;
--	cr16)
-+	cr16 | cr16-*)
- 		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
-@@ -668,7 +732,6 @@
- 	i370-ibm* | ibm*)
- 		basic_machine=i370-ibm
- 		;;
--# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
- 	i*86v32)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
-@@ -726,6 +789,13 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+	microblaze*)
-+		basic_machine=microblaze-xilinx
-+		;;
-+	mingw64)
-+		basic_machine=x86_64-pc
-+		os=-mingw64
-+		;;
- 	mingw32)
- 		basic_machine=i386-pc
- 		os=-mingw32
-@@ -762,10 +832,18 @@
- 	ms1-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- 		;;
-+	msys)
-+		basic_machine=i386-pc
-+		os=-msys
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
- 		;;
-+	nacl)
-+		basic_machine=le32-unknown
-+		os=-nacl
-+		;;
- 	ncr3000)
- 		basic_machine=i486-ncr
- 		os=-sysv4
-@@ -830,6 +908,12 @@
- 	np1)
- 		basic_machine=np1-gould
- 		;;
-+	neo-tandem)
-+		basic_machine=neo-tandem
-+		;;
-+	nse-tandem)
-+		basic_machine=nse-tandem
-+		;;
- 	nsr-tandem)
- 		basic_machine=nsr-tandem
- 		;;
-@@ -912,9 +996,10 @@
- 		;;
- 	power)	basic_machine=power-ibm
- 		;;
--	ppc)	basic_machine=powerpc-unknown
-+	ppc | ppcbe)	basic_machine=powerpc-unknown
- 		;;
--	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+	ppc-* | ppcbe-*)
-+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
-@@ -1008,6 +1093,9 @@
- 		basic_machine=i860-stratus
- 		os=-sysv4
- 		;;
-+	strongarm-* | thumb-*)
-+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	sun2)
- 		basic_machine=m68000-sun
- 		;;
-@@ -1064,20 +1152,8 @@
- 		basic_machine=t90-cray
- 		os=-unicos
- 		;;
--	tic54x | c54x*)
--		basic_machine=tic54x-unknown
--		os=-coff
--		;;
--	tic55x | c55x*)
--		basic_machine=tic55x-unknown
--		os=-coff
--		;;
--	tic6x | c6x*)
--		basic_machine=tic6x-unknown
--		os=-coff
--		;;
- 	tile*)
--		basic_machine=tile-unknown
-+		basic_machine=$basic_machine-unknown
- 		os=-linux-gnu
- 		;;
- 	tx39)
-@@ -1147,6 +1223,9 @@
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-+	xscale-* | xscalee[bl]-*)
-+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+		;;
- 	ymp)
- 		basic_machine=ymp-cray
- 		os=-unicos
-@@ -1244,9 +1323,12 @@
- if [ x"$os" != x"" ]
- then
- case $os in
--        # First match some system type aliases
--        # that might get confused with valid system types.
-+	# First match some system type aliases
-+	# that might get confused with valid system types.
- 	# -solaris* is a basic system type, with this one exception.
-+	-auroraux)
-+		os=-auroraux
-+		;;
- 	-solaris1 | -solaris1.*)
- 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
- 		;;
-@@ -1268,21 +1350,22 @@
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
--	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
--	      | -kopensolaris* \
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- 	      | -aos* | -aros* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
--	      | -openbsd* | -solidbsd* \
-+	      | -bitrig* | -openbsd* | -solidbsd* \
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* | -cegcc* \
--	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-@@ -1290,7 +1373,7 @@
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1329,7 +1412,7 @@
- 	-opened*)
- 		os=-openedition
- 		;;
--        -os400*)
-+	-os400*)
- 		os=-os400
- 		;;
- 	-wince*)
-@@ -1378,7 +1461,7 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
--        -tpf*)
-+	-tpf*)
- 		os=-tpf
- 		;;
- 	-triton*)
-@@ -1423,6 +1506,8 @@
- 	-dicos*)
- 		os=-dicos
- 		;;
-+	-nacl*)
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -1445,10 +1530,10 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
--        score-*)
-+	score-*)
- 		os=-elf
- 		;;
--        spu-*)
-+	spu-*)
- 		os=-elf
- 		;;
- 	*-acorn)
-@@ -1460,8 +1545,20 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--        c4x-* | tic4x-*)
--        	os=-coff
-+	c4x-* | tic4x-*)
-+		os=-coff
-+		;;
-+	hexagon-*)
-+		os=-elf
-+		;;
-+	tic54x-*)
-+		os=-coff
-+		;;
-+	tic55x-*)
-+		os=-coff
-+		;;
-+	tic6x-*)
-+		os=-coff
- 		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
-@@ -1481,14 +1578,11 @@
- 		;;
- 	m68000-sun)
- 		os=-sunos3
--		# This also exists in the configure program, but was not the
--		# default.
--		# os=-sunos4
- 		;;
- 	m68*-cisco)
- 		os=-aout
- 		;;
--        mep-*)
-+	mep-*)
- 		os=-elf
- 		;;
- 	mips*-cisco)
-@@ -1515,7 +1609,7 @@
- 	*-ibm)
- 		os=-aix
- 		;;
--    	*-knuth)
-+	*-knuth)
- 		os=-mmixware
- 		;;
- 	*-wec)
diff --git a/fribidi.spec b/fribidi.spec
index a7801ce..b4c39e8 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,13 +1,11 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 0.19.4
-Release: 5%{?dist}
+Version: 0.19.6
+Release: 1%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 Group: System Environment/Libraries
-Patch0: signedwarning.patch
-Patch1: fribidi-aarch64.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -25,8 +23,6 @@ FriBidi.
 
 %prep
 %setup -q
-%patch0 -p1 -b .signedwarnings
-%patch1 -p1 -b .aarch64
 
 %build
 %if 0%{?el5}
@@ -66,13 +62,18 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Mon Jan 13 2014 Caolán McNamara <caolanm@redhat.com> - 0.19.6-1
+- Resolves: rhbz#1052148 latest fribidi
+- drop integrated signedwarning.patch
+- drop integrated fribidi-aarch64.patch
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Wed Apr 03 2013 Caolán McNamara <caolanm@redhat.com> - 0.19.4-4
 - Resolves: rhbz#925368 support aarch64
 
-* Wed Feb 18 2013 Caolán McNamara <caolanm@redhat.com> - 0.19.4-3
+* Mon Feb 18 2013 Caolán McNamara <caolanm@redhat.com> - 0.19.4-3
 - Resolves: rhbz#884000 remove empty man pages
 
 * Mon Dec 10 2012 Caolán McNamara <caolanm@redhat.com> - 0.19.4-2
diff --git a/signedwarning.patch b/signedwarning.patch
deleted file mode 100644
index 06ae0ef..0000000
--- a/signedwarning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fribidi-0.19.4/bin/fribidi-main.c	2012-08-25 20:56:20.000000000 +0200
-+++ fribidi-0.19.4/bin/fribidi-main.c	2012-12-06 16:10:38.936894816 +0100
-@@ -519,7 +519,7 @@ 
- 				  idx++;
- 				}
- #endif /* !FRIBIDI_MAIN_USE_ICONV_H */
--			    if (wid < 0 && idx > st + 1)
-+			    if (wid < 0 && idx - st > 1)
- 			      idx--;
- 			    inlen = idx - st;
- 
diff --git a/sources b/sources
index 0e272be..6e0db33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0173f98ff929782d45819fc4a813c175  fribidi-0.19.4.tar.bz2
+ce93d862344991173dabb609bf93ca1d  fribidi-0.19.6.tar.bz2

From a67c8c337a7c0547aa080399328a7e47255b61da Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 07:55:29 -0500
Subject: [PATCH 18/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index b4c39e8..306caa8 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Mon Jan 13 2014 Caolán McNamara <caolanm@redhat.com> - 0.19.6-1
 - Resolves: rhbz#1052148 latest fribidi
 - drop integrated signedwarning.patch

From d778c163370c92c9a6223382e7e29d1fc5b31e68 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Sat, 16 Aug 2014 13:17:13 +0000
Subject: [PATCH 19/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 306caa8..e2976d4 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From ecf6425c3d157e7796b10cd07751c8bf73eb64fe Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Sat, 21 Feb 2015 22:26:13 +0100
Subject: [PATCH 20/85] Rebuilt for Fedora 23 Change

  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
---
 fribidi.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fribidi.spec b/fribidi.spec
index e2976d4..12c5ef7 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,10 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.19.6-4
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From 73e8ec7f32c31f30c68d42fd229261cb306e9f42 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 06:45:06 +0000
Subject: [PATCH 21/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 12c5ef7..eac339e 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.19.6-4
 - Rebuilt for Fedora 23 Change
   https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code

From 731aec81f6beaafd12d24cca990d783df7eac036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 11 Aug 2015 16:48:25 +0100
Subject: [PATCH 22/85] Resolves: rhbz#1250755 latest fribidi

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

diff --git a/.gitignore b/.gitignore
index 5697655..e147653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/fribidi-0.19.6.tar.bz2
+/fribidi-0.19.7.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index eac339e..494c22d 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 0.19.6
-Release: 5%{?dist}
+Version: 0.19.7
+Release: 1%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Tue Aug 11 2015 Caolán McNamara <caolanm@redhat.com> - 0.19.7-1
+- Resolves: rhbz#1250755 latest fribidi
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 6e0db33..e6ed12f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce93d862344991173dabb609bf93ca1d  fribidi-0.19.6.tar.bz2
+6c7e7cfdd39c908f7ac619351c1c5c23  fribidi-0.19.7.tar.bz2

From f0ef3128fb326e6c80261f6b0d8ba485566420e4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 20:49:51 +0000
Subject: [PATCH 23/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index 494c22d..d07b729 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Tue Aug 11 2015 Caolán McNamara <caolanm@redhat.com> - 0.19.7-1
 - Resolves: rhbz#1250755 latest fribidi
 

From 4fba214c7797ab01b99c01e33d66177ca1e7aeee Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 10:02:32 +0000
Subject: [PATCH 24/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index d07b729..be9f119 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 2ac807b896c1114be457ddbbee8200efab007319 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 08:48:06 +0000
Subject: [PATCH 25/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index be9f119..a72c768 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.7
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From b07b6ee68a3caa2db82bb93b3f0c12ffde13df2b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 2 Aug 2017 20:49:13 +0000
Subject: [PATCH 26/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

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

diff --git a/fribidi.spec b/fribidi.spec
index a72c768..e810dba 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -62,6 +62,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 848197f8aa132806398c259e05dfb98cab6a9408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 16 Oct 2017 16:25:43 +0100
Subject: [PATCH 27/85] Resolves: rhbz#1502675 enable make check

---
 fribidi.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fribidi.spec b/fribidi.spec
index e810dba..0326db8 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -40,6 +40,9 @@ export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %configure --disable-static
 make %{?_smp_mflags}
 
+%check
+make check
+
 %install
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,6 +65,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Mon Oct 16 2017 Caolán McNamara <caolanm@redhat.com> - 0.19.7-6
+- Resolves: rhbz#1502675 enable make check
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

From 14293d3211456abb8639fac468e2b502bbb36fb2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 10:13:15 +0000
Subject: [PATCH 28/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_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 0326db8..437310a 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 0.19.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://fribidi.org
 Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -65,6 +65,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Mon Oct 16 2017 Caolán McNamara <caolanm@redhat.com> - 0.19.7-6
 - Resolves: rhbz#1502675 enable make check
 

From 7eaedd7d030d144a5e554bc37861b812d378173f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 28 Feb 2018 10:27:17 +0000
Subject: [PATCH 29/85] Resolves: rhbz#1549934 latest version

---
 .gitignore   |  1 +
 fribidi.spec | 11 +++++++----
 sources      |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e147653..ae3b163 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /fribidi-0.19.7.tar.bz2
+/fribidi-1.0.1.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index 437310a..80e7ad4 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,9 +1,9 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 0.19.7
-Release: 7%{?dist}
-URL: http://fribidi.org
-Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
+Version: 1.0.1
+Release: 1%{?dist}
+URL: https://github.com/fribidi/fribidi/
+Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 Group: System Environment/Libraries
 
@@ -65,6 +65,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Wed Feb 28 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.1-1
+- Resolves: rhbz#1549934 latest version
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index e6ed12f..9b5e3ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c7e7cfdd39c908f7ac619351c1c5c23  fribidi-0.19.7.tar.bz2
+SHA512 (fribidi-1.0.1.tar.bz2) = 333dddba3dc54f3bbf8d739f670455c3c930c4a207c2642053f7f6b4d782cd6199fef41a007630e3ed20b5040e686ee30e9e63f5c0722fff6f73493058e0e5ac

From 04582d642bab89fc205eecf265d3924007f2f0c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 4 May 2018 09:27:45 +0100
Subject: [PATCH 30/85] Resolves: rhbz#1574858 latest version

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

diff --git a/.gitignore b/.gitignore
index ae3b163..71dc83c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /fribidi-0.19.7.tar.bz2
 /fribidi-1.0.1.tar.bz2
+/fribidi-1.0.2.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index 80e7ad4..9909d52 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,6 +1,6 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.1
+Version: 1.0.2
 Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
@@ -65,6 +65,9 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_mandir}/man3/%{name}_*.gz
 
 %changelog
+* Fri May 04 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.2-1
+- Resolves: rhbz#1574858 latest version
+
 * Wed Feb 28 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.1-1
 - Resolves: rhbz#1549934 latest version
 
diff --git a/sources b/sources
index 9b5e3ea..a3a2c6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.1.tar.bz2) = 333dddba3dc54f3bbf8d739f670455c3c930c4a207c2642053f7f6b4d782cd6199fef41a007630e3ed20b5040e686ee30e9e63f5c0722fff6f73493058e0e5ac
+bd2eb2f3a01ba11a541153f505005a7b  fribidi-1.0.2.tar.bz2

From 03a1b546ec99efb268c8d1b411f2801261b8f4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 4 May 2018 09:32:42 +0100
Subject: [PATCH 31/85] Resolves: rhbz#1574858 latest version

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index a3a2c6e..c941679 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bd2eb2f3a01ba11a541153f505005a7b  fribidi-1.0.2.tar.bz2
+SHA512 (fribidi-1.0.2.tar.bz2) = a474d01368b85c166e08a236425b6f13b88f2cf83308bf0df21c9fe034b1909edea30b778122719fcb8af72bdcf34f2f82f696031bcce077cf8ac764f019acaa

From a7928769e5d1879f47348b1053f6487c2ee837e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 4 May 2018 09:42:43 +0100
Subject: [PATCH 32/85] --disable-docs because there's no c2man

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

diff --git a/fribidi.spec b/fribidi.spec
index 9909d52..d8f790a 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -37,7 +37,7 @@ export CFLAGS="$CFLAGS -DPAGE_SIZE=4096"
 export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
 %endif
-%configure --disable-static
+%configure --disable-static --disable-docs
 make %{?_smp_mflags}
 
 %check
@@ -46,8 +46,6 @@ make check
 %install
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-# remove empty (compressed) man pages
-find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 
 %post -p /sbin/ldconfig
 
@@ -62,11 +60,10 @@ find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;
 %{_includedir}/fribidi
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/%{name}_*.gz
 
 %changelog
 * Fri May 04 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.2-1
-- Resolves: rhbz#1574858 latest version
+- Resolves: rhbz#1574858 latest version, --disable-docs because there's no c2man
 
 * Wed Feb 28 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.1-1
 - Resolves: rhbz#1549934 latest version

From 60b55e88fafc0309dd7b7fe24da15c5449e98d6a Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 31 May 2018 16:38:44 +0900
Subject: [PATCH 33/85] New upstream release.

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

diff --git a/.gitignore b/.gitignore
index 71dc83c..81cd819 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /fribidi-0.19.7.tar.bz2
 /fribidi-1.0.1.tar.bz2
 /fribidi-1.0.2.tar.bz2
+/fribidi-1.0.3.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index d8f790a..82ff03f 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,6 +1,6 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
@@ -54,7 +54,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %files
 %doc README AUTHORS COPYING ChangeLog THANKS NEWS TODO
 %{_bindir}/fribidi
-%{_libdir}/libfribidi.so.*
+%{_libdir}/libfribidi.so.0*
 
 %files devel
 %{_includedir}/fribidi
@@ -62,6 +62,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu May 31 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.3-1
+- New upstream release.
+
 * Fri May 04 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.2-1
 - Resolves: rhbz#1574858 latest version, --disable-docs because there's no c2man
 
diff --git a/sources b/sources
index c941679..05188bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.2.tar.bz2) = a474d01368b85c166e08a236425b6f13b88f2cf83308bf0df21c9fe034b1909edea30b778122719fcb8af72bdcf34f2f82f696031bcce077cf8ac764f019acaa
+SHA512 (fribidi-1.0.3.tar.bz2) = 2891f08824f2be60445d30cdb7e256d489d0e13642a80c3b6d1a492e9ad644b8f6c2d2826512b61ff9fa1616e24678d365ac1247fa5a8d95633f8cfbd9376965

From 52fba222e625081fcea10034bee243eedfb7b14d Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 31 May 2018 16:46:42 +0900
Subject: [PATCH 34/85] New upstream release.

---
 fribidi.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fribidi.spec b/fribidi.spec
index 82ff03f..6a61e12 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -60,6 +60,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/fribidi
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/*.gz
 
 %changelog
 * Thu May 31 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.3-1

From a58f6fe30e292b11983d94eac93d07e4f1fa9677 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 31 May 2018 16:47:30 +0900
Subject: [PATCH 35/85] New upstream release. (#1584541)

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

diff --git a/fribidi.spec b/fribidi.spec
index 6a61e12..8713a40 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -64,7 +64,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %changelog
 * Thu May 31 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.3-1
-- New upstream release.
+- New upstream release. (#1584541)
 
 * Fri May 04 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.2-1
 - Resolves: rhbz#1574858 latest version, --disable-docs because there's no c2man

From bbe3f324b055e3c035e1c6191888b3f265a6cee0 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 8 Jun 2018 21:05:12 +0900
Subject: [PATCH 36/85] New upstream release. (#1587985)

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

diff --git a/.gitignore b/.gitignore
index 81cd819..58717e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /fribidi-1.0.1.tar.bz2
 /fribidi-1.0.2.tar.bz2
 /fribidi-1.0.3.tar.bz2
+/fribidi-1.0.4.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index 8713a40..3a6bdbd 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,6 +1,6 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.3
+Version: 1.0.4
 Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
@@ -63,6 +63,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Fri Jun 08 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-1
+- New upstream release. (#1587985)
+
 * Thu May 31 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.3-1
 - New upstream release. (#1584541)
 
diff --git a/sources b/sources
index 05188bd..bb491aa 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (fribidi-1.0.3.tar.bz2) = 2891f08824f2be60445d30cdb7e256d489d0e13642a80c3b6d1a492e9ad644b8f6c2d2826512b61ff9fa1616e24678d365ac1247fa5a8d95633f8cfbd9376965
+SHA512 (fribidi-1.0.4.tar.bz2) = 435bd48c48ec3c2dc1f1266e401abdbd400d2202b55df6367dbe84580c21e4aa73205058324cf630dfec365733d3e0ac186d14608baa1c9f63231875fb7cc525

From 8bd98c48a46b57bba1dbcdd222a5e2570b66e0e2 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 29 Jun 2018 07:43:36 +0000
Subject: [PATCH 37/85] Use ldconfig rpm macro.

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

diff --git a/fribidi.spec b/fribidi.spec
index 3a6bdbd..bdd7a91 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.4
-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.bz2
 License: LGPLv2+ and UCD
@@ -47,9 +47,7 @@ make check
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %doc README AUTHORS COPYING ChangeLog THANKS NEWS TODO
@@ -63,6 +61,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Fri Jun 29 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-2
+- Use ldconfig rpm macro.
+
 * Fri Jun 08 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-1
 - New upstream release. (#1587985)
 

From b753257238052d164e46d4bd0eead05119d9f2c8 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 12 Jul 2018 10:44:02 +0000
Subject: [PATCH 38/85] Modernize spec file.

---
 fribidi.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fribidi.spec b/fribidi.spec
index bdd7a91..9d301d5 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -5,7 +5,6 @@ Release: 2%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
-Group: System Environment/Libraries
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -14,7 +13,6 @@ is always written in logical order.
 
 %package devel
 Summary: Libraries and include files for FriBidi
-Group: System Environment/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -22,7 +20,7 @@ Include files and libraries needed for developing applications which use
 FriBidi.
 
 %prep
-%setup -q
+%autosetup
 
 %build
 %if 0%{?el5}
@@ -50,7 +48,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %ldconfig_scriptlets
 
 %files
-%doc README AUTHORS COPYING ChangeLog THANKS NEWS TODO
+%doc README AUTHORS ChangeLog THANKS NEWS TODO
+%license COPYING
 %{_bindir}/fribidi
 %{_libdir}/libfribidi.so.0*
 
@@ -61,6 +60,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jul 12 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-3
+- Modernize spec file.
+
 * Fri Jun 29 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-2
 - Use ldconfig rpm macro.
 

From 82384d1798e0b75777e9ef69aaed305b070ace5f Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 12 Jul 2018 10:46:46 +0000
Subject: [PATCH 39/85] Modernize spec file.

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

diff --git a/fribidi.spec b/fribidi.spec
index 9d301d5..2f335f9 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.4
-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.bz2
 License: LGPLv2+ and UCD

From 22f20f2159b4bab22af21af630c461eb5cd90a70 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 00:52:58 +0000
Subject: [PATCH 40/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_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 2f335f9..b8155aa 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.4
-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.bz2
 License: LGPLv2+ and UCD
@@ -60,6 +60,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Jul 12 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-3
 - Modernize spec file.
 

From 03bf24302e9292a68b28b86a7c236eac7976a5bf Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 17 Jul 2018 07:25:23 +0000
Subject: [PATCH 41/85] Add BR: gcc.

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

diff --git a/fribidi.spec b/fribidi.spec
index b8155aa..e09d941 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,10 +1,11 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.4
-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.bz2
 License: LGPLv2+ and UCD
+BuildRequires: gcc
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -60,6 +61,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Tue Jul 17 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-5
+- Add BR: gcc.
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 4712c88bc8ef2a17a38fd5bee527f4defbbc5f36 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 26 Jul 2018 09:59:09 +0000
Subject: [PATCH 42/85] Drop bundled gnulib code.

---
 fribidi-drop-bundled-gnulib.patch | 1852 +++++++++++++++++++++++++++++
 fribidi.spec                      |    9 +-
 2 files changed, 1859 insertions(+), 2 deletions(-)
 create mode 100644 fribidi-drop-bundled-gnulib.patch

diff --git a/fribidi-drop-bundled-gnulib.patch b/fribidi-drop-bundled-gnulib.patch
new file mode 100644
index 0000000..fc020d4
--- /dev/null
+++ b/fribidi-drop-bundled-gnulib.patch
@@ -0,0 +1,1852 @@
+diff -pruN fribidi-1.0.4.orig/bin/Makefile.am fribidi-1.0.4/bin/Makefile.am
+--- fribidi-1.0.4.orig/bin/Makefile.am	2018-02-19 21:25:06.000000000 +0000
++++ fribidi-1.0.4/bin/Makefile.am	2018-07-26 09:53:02.746415439 +0000
+@@ -2,11 +2,9 @@ bin_PROGRAMS = fribidi
+ 
+ noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
+ 
+-getopt_SOURCES = getopt.c getopt1.c getopt_int.h getopt.h gettext.h
++fribidi_SOURCES = fribidi-main.c
+ 
+-fribidi_SOURCES = fribidi-main.c $(getopt_SOURCES)
+-
+-fribidi_benchmark_SOURCES = fribidi-benchmark.c $(getopt_SOURCES)
++fribidi_benchmark_SOURCES = fribidi-benchmark.c
+ 
+ AM_CPPFLAGS = \
+ 		-I$(top_builddir)/lib \
+diff -pruN fribidi-1.0.4.orig/bin/getopt.c fribidi-1.0.4/bin/getopt.c
+--- fribidi-1.0.4.orig/bin/getopt.c	2018-02-03 20:57:13.000000000 +0000
++++ fribidi-1.0.4/bin/getopt.c	1970-01-01 00:00:00.000000000 +0000
+@@ -1,1268 +0,0 @@
+-/* Getopt for GNU.
+-   NOTE: getopt is now part of the C library, so if you don't know what
+-   "Keep this file name-space clean" means, talk to drepper@gnu.org
+-   before changing it!
+-   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
+-   	Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   This program is free software; you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
+-
+-   This program is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License along
+-   with this program; if not, write to the Free Software Foundation,
+-   Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA.  */
+-
+-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+-   Ditto for AIX 3.2 and <stdlib.h>.  */
+-#ifndef _NO_PROTO
+-# define _NO_PROTO
+-#endif
+-
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-/* Comment out all this code if we are using the GNU C Library, and are not
+-   actually compiling the library itself.  This code is part of the GNU C
+-   Library, but also included in many other GNU distributions.  Compiling
+-   and linking in this code is a waste when using the GNU C library
+-   (especially if it is a shared library).  Rather than having every GNU
+-   program understand `configure --with-gnu-libc' and omit the object files,
+-   it is simpler to just do this in the source for each such file.  */
+-
+-#define GETOPT_INTERFACE_VERSION 2
+-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+-# include <gnu-versions.h>
+-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+-#  define ELIDE_CODE
+-# endif
+-#endif
+-
+-#ifndef ELIDE_CODE
+-
+-
+-/* This needs to come after some library #include
+-   to get __GNU_LIBRARY__ defined.  */
+-#ifdef	__GNU_LIBRARY__
+-/* Don't include stdlib.h for non-GNU C libraries because some of them
+-   contain conflicting prototypes for getopt.  */
+-# include <stdlib.h>
+-# include <unistd.h>
+-#endif /* GNU C library.  */
+-
+-#include <string.h>
+-
+-#ifdef VMS
+-# include <unixlib.h>
+-#endif
+-
+-#ifdef _LIBC
+-# include <libintl.h>
+-#else
+-# include "gettext.h"
+-# define _(msgid) gettext (msgid)
+-#endif
+-
+-#if defined _LIBC && defined USE_IN_LIBIO
+-# include <wchar.h>
+-#endif
+-
+-#ifndef attribute_hidden
+-# define attribute_hidden
+-#endif
+-
+-/* This version of `getopt' appears to the caller like standard Unix `getopt'
+-   but it behaves differently for the user, since it allows the user
+-   to intersperse the options with the other arguments.
+-
+-   As `getopt' works, it permutes the elements of ARGV so that,
+-   when it is done, all the options precede everything else.  Thus
+-   all application programs are extended to handle flexible argument order.
+-
+-   Setting the environment variable POSIXLY_CORRECT disables permutation.
+-   Then the behavior is completely standard.
+-
+-   GNU application programs can use a third alternative mode in which
+-   they can distinguish the relative order of options and other arguments.  */
+-
+-#include "getopt.h"
+-#include "getopt_int.h"
+-
+-/* For communication from `getopt' to the caller.
+-   When `getopt' finds an option that takes an argument,
+-   the argument value is returned here.
+-   Also, when `ordering' is RETURN_IN_ORDER,
+-   each non-option ARGV-element is returned here.  */
+-
+-char *optarg;
+-
+-/* Index in ARGV of the next element to be scanned.
+-   This is used for communication to and from the caller
+-   and for communication between successive calls to `getopt'.
+-
+-   On entry to `getopt', zero means this is the first call; initialize.
+-
+-   When `getopt' returns -1, this is the index of the first of the
+-   non-option elements that the caller should itself scan.
+-
+-   Otherwise, `optind' communicates from one call to the next
+-   how much of ARGV has been scanned so far.  */
+-
+-/* 1003.2 says this must be 1 before any call.  */
+-int optind = 1;
+-
+-/* Callers store zero here to inhibit the error message
+-   for unrecognized options.  */
+-
+-int opterr = 1;
+-
+-/* Set to an option character which was unrecognized.
+-   This must be initialized on some systems to avoid linking in the
+-   system's own getopt implementation.  */
+-
+-int optopt = '?';
+-
+-/* Keep a global copy of all internal members of getopt_data.  */
+-
+-static struct _getopt_data getopt_data;
+-
+-
+-#ifndef __GNU_LIBRARY__
+-
+-/* Avoid depending on library functions or files
+-   whose names are inconsistent.  */
+-
+-#ifndef getenv
+-extern char *getenv (
+-);
+-#endif
+-
+-#endif /* not __GNU_LIBRARY__ */
+-
+-#ifdef _LIBC
+-/* Stored original parameters.
+-   XXX This is no good solution.  We should rather copy the args so
+-   that we can compare them later.  But we must not use malloc(3).  */
+-extern int __libc_argc;
+-extern char **__libc_argv;
+-
+-/* Bash 2.0 gives us an environment variable containing flags
+-   indicating ARGV elements that should not be considered arguments.  */
+-
+-# ifdef USE_NONOPTION_FLAGS
+-/* Defined in getopt_init.c  */
+-extern char *__getopt_nonoption_flags;
+-# endif
+-
+-# ifdef USE_NONOPTION_FLAGS
+-#  define SWAP_FLAGS(ch1, ch2) \
+-  if (d->__nonoption_flags_len > 0)					      \
+-    {									      \
+-      char __tmp = __getopt_nonoption_flags[ch1];			      \
+-      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
+-      __getopt_nonoption_flags[ch2] = __tmp;				      \
+-    }
+-# else
+-#  define SWAP_FLAGS(ch1, ch2)
+-# endif
+-#else /* !_LIBC */
+-# define SWAP_FLAGS(ch1, ch2)
+-#endif /* _LIBC */
+-
+-/* Exchange two adjacent subsequences of ARGV.
+-   One subsequence is elements [first_nonopt,last_nonopt)
+-   which contains all the non-options that have been skipped so far.
+-   The other is elements [last_nonopt,optind), which contains all
+-   the options processed since those non-options were skipped.
+-
+-   `first_nonopt' and `last_nonopt' are relocated so that they describe
+-   the new indices of the non-options in ARGV after they are moved.  */
+-
+-static void
+-exchange (
+-  char **argv,
+-  struct _getopt_data *d
+-)
+-{
+-  int bottom = d->__first_nonopt;
+-  int middle = d->__last_nonopt;
+-  int top = d->optind;
+-  char *tem;
+-
+-  /* Exchange the shorter segment with the far end of the longer segment.
+-     That puts the shorter segment into the right place.
+-     It leaves the longer segment in the right place overall,
+-     but it consists of two parts that need to be swapped next.  */
+-
+-#if defined _LIBC && defined USE_NONOPTION_FLAGS
+-  /* First make sure the handling of the `__getopt_nonoption_flags'
+-     string can work normally.  Our top argument must be in the range
+-     of the string.  */
+-  if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
+-    {
+-      /* We must extend the array.  The user plays games with us and
+-         presents new arguments.  */
+-      char *new_str = malloc (top + 1);
+-      if (new_str == NULL)
+-	d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
+-      else
+-	{
+-	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+-			     d->__nonoption_flags_max_len),
+-		  '\0', top + 1 - d->__nonoption_flags_max_len);
+-	  d->__nonoption_flags_max_len = top + 1;
+-	  __getopt_nonoption_flags = new_str;
+-	}
+-    }
+-#endif
+-
+-  while (top > middle && middle > bottom)
+-    {
+-      if (top - middle > middle - bottom)
+-	{
+-	  /* Bottom segment is the short one.  */
+-	  int len = middle - bottom;
+-	  register int i;
+-
+-	  /* Swap it with the top part of the top segment.  */
+-	  for (i = 0; i < len; i++)
+-	    {
+-	      tem = argv[bottom + i];
+-	      argv[bottom + i] = argv[top - (middle - bottom) + i];
+-	      argv[top - (middle - bottom) + i] = tem;
+-	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+-	    }
+-	  /* Exclude the moved bottom segment from further swapping.  */
+-	  top -= len;
+-	}
+-      else
+-	{
+-	  /* Top segment is the short one.  */
+-	  int len = top - middle;
+-	  register int i;
+-
+-	  /* Swap it with the bottom part of the bottom segment.  */
+-	  for (i = 0; i < len; i++)
+-	    {
+-	      tem = argv[bottom + i];
+-	      argv[bottom + i] = argv[middle + i];
+-	      argv[middle + i] = tem;
+-	      SWAP_FLAGS (bottom + i, middle + i);
+-	    }
+-	  /* Exclude the moved top segment from further swapping.  */
+-	  bottom += len;
+-	}
+-    }
+-
+-  /* Update records for the slots the non-options now occupy.  */
+-
+-  d->__first_nonopt += (d->optind - d->__last_nonopt);
+-  d->__last_nonopt = d->optind;
+-}
+-
+-/* Initialize the internal data when the first call is made.  */
+-
+-static const char *
+-_getopt_initialize (
+-  int argc,
+-  char *const *argv,
+-  const char *optstring,
+-  struct _getopt_data *d
+-)
+-{
+-  /* Start processing options with ARGV-element 1 (since ARGV-element 0
+-     is the program name); the sequence of previously skipped
+-     non-option ARGV-elements is empty.  */
+-
+-  d->__first_nonopt = d->__last_nonopt = d->optind;
+-
+-  d->__nextchar = NULL;
+-
+-  d->__posixly_correct = !!getenv ("POSIXLY_CORRECT");
+-
+-  /* Determine how to handle the ordering of options and nonoptions.  */
+-
+-  if (optstring[0] == '-')
+-    {
+-      d->__ordering = RETURN_IN_ORDER;
+-      ++optstring;
+-    }
+-  else if (optstring[0] == '+')
+-    {
+-      d->__ordering = REQUIRE_ORDER;
+-      ++optstring;
+-    }
+-  else if (d->__posixly_correct)
+-    d->__ordering = REQUIRE_ORDER;
+-  else
+-    d->__ordering = PERMUTE;
+-
+-#if defined _LIBC && defined USE_NONOPTION_FLAGS
+-  if (!d->__posixly_correct && argc == __libc_argc && argv == __libc_argv)
+-    {
+-      if (d->__nonoption_flags_max_len == 0)
+-	{
+-	  if (__getopt_nonoption_flags == NULL
+-	      || __getopt_nonoption_flags[0] == '\0')
+-	    d->__nonoption_flags_max_len = -1;
+-	  else
+-	    {
+-	      const char *orig_str = __getopt_nonoption_flags;
+-	      int len = d->__nonoption_flags_max_len = strlen (orig_str);
+-	      if (d->__nonoption_flags_max_len < argc)
+-		d->__nonoption_flags_max_len = argc;
+-	      __getopt_nonoption_flags =
+-		(char *) malloc (d->__nonoption_flags_max_len);
+-	      if (__getopt_nonoption_flags == NULL)
+-		d->__nonoption_flags_max_len = -1;
+-	      else
+-		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+-			'\0', d->__nonoption_flags_max_len - len);
+-	    }
+-	}
+-      d->__nonoption_flags_len = d->__nonoption_flags_max_len;
+-    }
+-  else
+-    d->__nonoption_flags_len = 0;
+-#endif
+-
+-  return optstring;
+-}
+-
+-/* Scan elements of ARGV (whose length is ARGC) for option characters
+-   given in OPTSTRING.
+-
+-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+-   then it is an option element.  The characters of this element
+-   (aside from the initial '-') are option characters.  If `getopt'
+-   is called repeatedly, it returns successively each of the option characters
+-   from each of the option elements.
+-
+-   If `getopt' finds another option character, it returns that character,
+-   updating `optind' and `nextchar' so that the next call to `getopt' can
+-   resume the scan with the following option character or ARGV-element.
+-
+-   If there are no more option characters, `getopt' returns -1.
+-   Then `optind' is the index in ARGV of the first ARGV-element
+-   that is not an option.  (The ARGV-elements have been permuted
+-   so that those that are not options now come last.)
+-
+-   OPTSTRING is a string containing the legitimate option characters.
+-   If an option character is seen that is not listed in OPTSTRING,
+-   return '?' after printing an error message.  If you set `opterr' to
+-   zero, the error message is suppressed but we still return '?'.
+-
+-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+-   so the following text in the same ARGV-element, or the text of the following
+-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+-   wants an optional arg; if there is text in the current ARGV-element,
+-   it is returned in `optarg', otherwise `optarg' is set to zero.
+-
+-   If OPTSTRING starts with `-' or `+', it requests different methods of
+-   handling the non-option ARGV-elements.
+-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+-
+-   Long-named options begin with `--' instead of `-'.
+-   Their names may be abbreviated as long as the abbreviation is unique
+-   or is an exact match for some defined option.  If they have an
+-   argument, it follows the option name in the same ARGV-element, separated
+-   from the option name by a `=', or else the in next ARGV-element.
+-   When `getopt' finds a long-named option, it returns 0 if that option's
+-   `flag' field is nonzero, the value of the option's `val' field
+-   if the `flag' field is zero.
+-
+-   The elements of ARGV aren't really const, because we permute them.
+-   But we pretend they're const in the prototype to be compatible
+-   with other systems.
+-
+-   LONGOPTS is a vector of `struct option' terminated by an
+-   element containing a name which is zero.
+-
+-   LONGIND returns the index in LONGOPT of the long-named option found.
+-   It is only valid when a long-named option has been found by the most
+-   recent call.
+-
+-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+-   long-named options.  */
+-
+-int
+-_getopt_internal_r (
+-  int argc,
+-  char *const *argv,
+-  const char *optstring,
+-  const struct option *longopts,
+-  int *longind,
+-  int long_only,
+-  struct _getopt_data *d
+-)
+-{
+-  int print_errors = d->opterr;
+-  if (optstring[0] == ':')
+-    print_errors = 0;
+-
+-  if (argc < 1)
+-    return -1;
+-
+-  d->optarg = NULL;
+-
+-  if (d->optind == 0 || !d->__initialized)
+-    {
+-      if (d->optind == 0)
+-	d->optind = 1;		/* Don't scan ARGV[0], the program name.  */
+-      optstring = _getopt_initialize (argc, argv, optstring, d);
+-      d->__initialized = 1;
+-    }
+-
+-  /* Test whether ARGV[optind] points to a non-option argument.
+-     Either it does not have option syntax, or there is an environment flag
+-     from the shell indicating it is not an option.  The later information
+-     is only used when the used in the GNU libc.  */
+-#if defined _LIBC && defined USE_NONOPTION_FLAGS
+-# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
+-		      || (d->optind < d->__nonoption_flags_len		      \
+-			  && __getopt_nonoption_flags[d->optind] == '1'))
+-#else
+-# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
+-#endif
+-
+-  if (d->__nextchar == NULL || *d->__nextchar == '\0')
+-    {
+-      /* Advance to the next ARGV-element.  */
+-
+-      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+-         moved back by the user (who may also have changed the arguments).  */
+-      if (d->__last_nonopt > d->optind)
+-	d->__last_nonopt = d->optind;
+-      if (d->__first_nonopt > d->optind)
+-	d->__first_nonopt = d->optind;
+-
+-      if (d->__ordering == PERMUTE)
+-	{
+-	  /* If we have just processed some options following some non-options,
+-	     exchange them so that the options come first.  */
+-
+-	  if (d->__first_nonopt != d->__last_nonopt
+-	      && d->__last_nonopt != d->optind)
+-	    exchange ((char **) argv, d);
+-	  else if (d->__last_nonopt != d->optind)
+-	    d->__first_nonopt = d->optind;
+-
+-	  /* Skip any additional non-options
+-	     and extend the range of non-options previously skipped.  */
+-
+-	  while (d->optind < argc && NONOPTION_P)
+-	    d->optind++;
+-	  d->__last_nonopt = d->optind;
+-	}
+-
+-      /* The special ARGV-element `--' means premature end of options.
+-         Skip it like a null option,
+-         then exchange with previous non-options as if it were an option,
+-         then skip everything else like a non-option.  */
+-
+-      if (d->optind != argc && !strcmp (argv[d->optind], "--"))
+-	{
+-	  d->optind++;
+-
+-	  if (d->__first_nonopt != d->__last_nonopt
+-	      && d->__last_nonopt != d->optind)
+-	    exchange ((char **) argv, d);
+-	  else if (d->__first_nonopt == d->__last_nonopt)
+-	    d->__first_nonopt = d->optind;
+-	  d->__last_nonopt = argc;
+-
+-	  d->optind = argc;
+-	}
+-
+-      /* If we have done all the ARGV-elements, stop the scan
+-         and back over any non-options that we skipped and permuted.  */
+-
+-      if (d->optind == argc)
+-	{
+-	  /* Set the next-arg-index to point at the non-options
+-	     that we previously skipped, so the caller will digest them.  */
+-	  if (d->__first_nonopt != d->__last_nonopt)
+-	    d->optind = d->__first_nonopt;
+-	  return -1;
+-	}
+-
+-      /* If we have come to a non-option and did not permute it,
+-         either stop the scan or describe it to the caller and pass it by.  */
+-
+-      if (NONOPTION_P)
+-	{
+-	  if (d->__ordering == REQUIRE_ORDER)
+-	    return -1;
+-	  d->optarg = argv[d->optind++];
+-	  return 1;
+-	}
+-
+-      /* We have found another option-ARGV-element.
+-         Skip the initial punctuation.  */
+-
+-      d->__nextchar = (argv[d->optind] + 1
+-		       + (longopts != NULL && argv[d->optind][1] == '-'));
+-    }
+-
+-  /* Decode the current option-ARGV-element.  */
+-
+-  /* Check whether the ARGV-element is a long option.
+-
+-     If long_only and the ARGV-element has the form "-f", where f is
+-     a valid short option, don't consider it an abbreviated form of
+-     a long option that starts with f.  Otherwise there would be no
+-     way to give the -f short option.
+-
+-     On the other hand, if there's a long option "fubar" and
+-     the ARGV-element is "-fu", do consider that an abbreviation of
+-     the long option, just like "--fu", and not "-f" with arg "u".
+-
+-     This distinction seems to be the most useful approach.  */
+-
+-  if (longopts != NULL
+-      && (argv[d->optind][1] == '-'
+-	  || (long_only && (argv[d->optind][2]
+-			    || !strchr (optstring, argv[d->optind][1])))))
+-    {
+-      char *nameend;
+-      const struct option *p;
+-      const struct option *pfound = NULL;
+-      int exact = 0;
+-      int ambig = 0;
+-      int indfound = -1;
+-      int option_index;
+-
+-      for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
+-	/* Do nothing.  */ ;
+-
+-      /* Test all long options for either exact match
+-         or abbreviated matches.  */
+-      for (p = longopts, option_index = 0; p->name; p++, option_index++)
+-	if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+-	  {
+-	    if ((unsigned int) (nameend - d->__nextchar)
+-		== (unsigned int) strlen (p->name))
+-	      {
+-		/* Exact match found.  */
+-		pfound = p;
+-		indfound = option_index;
+-		exact = 1;
+-		break;
+-	      }
+-	    else if (pfound == NULL)
+-	      {
+-		/* First nonexact match found.  */
+-		pfound = p;
+-		indfound = option_index;
+-	      }
+-	    else if (long_only
+-		     || pfound->has_arg != p->has_arg
+-		     || pfound->flag != p->flag || pfound->val != p->val)
+-	      /* Second or later nonexact match found.  */
+-	      ambig = 1;
+-	  }
+-
+-      if (ambig && !exact)
+-	{
+-	  if (print_errors)
+-	    {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-	      char *buf;
+-
+-	      if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+-			      argv[0], argv[d->optind]) >= 0)
+-		{
+-		  _IO_flockfile (stderr);
+-
+-		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+-
+-		  if (_IO_fwide (stderr, 0) > 0)
+-		    __fwprintf (stderr, L"%s", buf);
+-		  else
+-		    fputs (buf, stderr);
+-
+-		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-		  _IO_funlockfile (stderr);
+-
+-		  free (buf);
+-		}
+-#else
+-	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+-		       argv[0], argv[d->optind]);
+-#endif
+-	    }
+-	  d->__nextchar += strlen (d->__nextchar);
+-	  d->optind++;
+-	  d->optopt = 0;
+-	  return '?';
+-	}
+-
+-      if (pfound != NULL)
+-	{
+-	  option_index = indfound;
+-	  d->optind++;
+-	  if (*nameend)
+-	    {
+-	      /* Don't test has_arg with >, because some C compilers don't
+-	         allow it to be used on enums.  */
+-	      if (pfound->has_arg)
+-		d->optarg = nameend + 1;
+-	      else
+-		{
+-		  if (print_errors)
+-		    {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		      char *buf;
+-		      int n;
+-#endif
+-
+-		      if (argv[d->optind - 1][1] == '-')
+-			{
+-			  /* --option */
+-#if defined _LIBC && defined USE_IN_LIBIO
+-			  n = __asprintf (&buf, _("\
+-%s: option `--%s' doesn't allow an argument\n"), argv[0], pfound->name);
+-#else
+-			  fprintf (stderr, _("\
+-%s: option `--%s' doesn't allow an argument\n"), argv[0], pfound->name);
+-#endif
+-			}
+-		      else
+-			{
+-			  /* +option or -option */
+-#if defined _LIBC && defined USE_IN_LIBIO
+-			  n = __asprintf (&buf, _("\
+-%s: option `%c%s' doesn't allow an argument\n"), argv[0], argv[d->optind - 1][0], pfound->name);
+-#else
+-			  fprintf (stderr, _("\
+-%s: option `%c%s' doesn't allow an argument\n"), argv[0], argv[d->optind - 1][0], pfound->name);
+-#endif
+-			}
+-
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		      if (n >= 0)
+-			{
+-			  _IO_flockfile (stderr);
+-
+-			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-			  ((_IO_FILE *) stderr)->_flags2
+-			    |= _IO_FLAGS2_NOTCANCEL;
+-
+-			  if (_IO_fwide (stderr, 0) > 0)
+-			    __fwprintf (stderr, L"%s", buf);
+-			  else
+-			    fputs (buf, stderr);
+-
+-			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-			  _IO_funlockfile (stderr);
+-
+-			  free (buf);
+-			}
+-#endif
+-		    }
+-
+-		  d->__nextchar += strlen (d->__nextchar);
+-
+-		  d->optopt = pfound->val;
+-		  return '?';
+-		}
+-	    }
+-	  else if (pfound->has_arg == 1)
+-	    {
+-	      if (d->optind < argc)
+-		d->optarg = argv[d->optind++];
+-	      else
+-		{
+-		  if (print_errors)
+-		    {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		      char *buf;
+-
+-		      if (__asprintf (&buf, _("\
+-%s: option `%s' requires an argument\n"), argv[0], argv[d->optind - 1]) >= 0)
+-			{
+-			  _IO_flockfile (stderr);
+-
+-			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-			  ((_IO_FILE *) stderr)->_flags2
+-			    |= _IO_FLAGS2_NOTCANCEL;
+-
+-			  if (_IO_fwide (stderr, 0) > 0)
+-			    __fwprintf (stderr, L"%s", buf);
+-			  else
+-			    fputs (buf, stderr);
+-
+-			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-			  _IO_funlockfile (stderr);
+-
+-			  free (buf);
+-			}
+-#else
+-		      fprintf (stderr,
+-			       _("%s: option `%s' requires an argument\n"),
+-			       argv[0], argv[d->optind - 1]);
+-#endif
+-		    }
+-		  d->__nextchar += strlen (d->__nextchar);
+-		  d->optopt = pfound->val;
+-		  return optstring[0] == ':' ? ':' : '?';
+-		}
+-	    }
+-	  d->__nextchar += strlen (d->__nextchar);
+-	  if (longind != NULL)
+-	    *longind = option_index;
+-	  if (pfound->flag)
+-	    {
+-	      *(pfound->flag) = pfound->val;
+-	      return 0;
+-	    }
+-	  return pfound->val;
+-	}
+-
+-      /* Can't find it as a long option.  If this is not getopt_long_only,
+-         or the option starts with '--' or is not a valid short
+-         option, then it's an error.
+-         Otherwise interpret it as a short option.  */
+-      if (!long_only || argv[d->optind][1] == '-'
+-	  || strchr (optstring, *d->__nextchar) == NULL)
+-	{
+-	  if (print_errors)
+-	    {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-	      char *buf;
+-	      int n;
+-#endif
+-
+-	      if (argv[d->optind][1] == '-')
+-		{
+-		  /* --option */
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		  n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+-				  argv[0], d->__nextchar);
+-#else
+-		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+-			   argv[0], d->__nextchar);
+-#endif
+-		}
+-	      else
+-		{
+-		  /* +option or -option */
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		  n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+-				  argv[0], argv[d->optind][0], d->__nextchar);
+-#else
+-		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+-			   argv[0], argv[d->optind][0], d->__nextchar);
+-#endif
+-		}
+-
+-#if defined _LIBC && defined USE_IN_LIBIO
+-	      if (n >= 0)
+-		{
+-		  _IO_flockfile (stderr);
+-
+-		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+-
+-		  if (_IO_fwide (stderr, 0) > 0)
+-		    __fwprintf (stderr, L"%s", buf);
+-		  else
+-		    fputs (buf, stderr);
+-
+-		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-		  _IO_funlockfile (stderr);
+-
+-		  free (buf);
+-		}
+-#endif
+-	    }
+-	  d->__nextchar = (char *) "";
+-	  d->optind++;
+-	  d->optopt = 0;
+-	  return '?';
+-	}
+-    }
+-
+-  /* Look at and handle the next short option-character.  */
+-
+-  {
+-    char c = *d->__nextchar++;
+-    char *temp = strchr (optstring, c);
+-
+-    /* Increment `optind' when we start to process its last character.  */
+-    if (*d->__nextchar == '\0')
+-      ++d->optind;
+-
+-    if (temp == NULL || c == ':')
+-      {
+-	if (print_errors)
+-	  {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-	    char *buf;
+-	    int n;
+-#endif
+-
+-	    if (d->__posixly_correct)
+-	      {
+-		/* 1003.2 specifies the format of this message.  */
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+-				argv[0], c);
+-#else
+-		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+-#endif
+-	      }
+-	    else
+-	      {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+-				argv[0], c);
+-#else
+-		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+-#endif
+-	      }
+-
+-#if defined _LIBC && defined USE_IN_LIBIO
+-	    if (n >= 0)
+-	      {
+-		_IO_flockfile (stderr);
+-
+-		int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-		((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+-
+-		if (_IO_fwide (stderr, 0) > 0)
+-		  __fwprintf (stderr, L"%s", buf);
+-		else
+-		  fputs (buf, stderr);
+-
+-		((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-		_IO_funlockfile (stderr);
+-
+-		free (buf);
+-	      }
+-#endif
+-	  }
+-	d->optopt = c;
+-	return '?';
+-      }
+-    /* Convenience. Treat POSIX -W foo same as long option --foo */
+-    if (temp[0] == 'W' && temp[1] == ';')
+-      {
+-	char *nameend;
+-	const struct option *p;
+-	const struct option *pfound = NULL;
+-	int exact = 0;
+-	int ambig = 0;
+-	int indfound = 0;
+-	int option_index;
+-
+-	/* This is an option that requires an argument.  */
+-	if (*d->__nextchar != '\0')
+-	  {
+-	    d->optarg = d->__nextchar;
+-	    /* If we end this ARGV-element by taking the rest as an arg,
+-	       we must advance to the next element now.  */
+-	    d->optind++;
+-	  }
+-	else if (d->optind == argc)
+-	  {
+-	    if (print_errors)
+-	      {
+-		/* 1003.2 specifies the format of this message.  */
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		char *buf;
+-
+-		if (__asprintf (&buf,
+-				_("%s: option requires an argument -- %c\n"),
+-				argv[0], c) >= 0)
+-		  {
+-		    _IO_flockfile (stderr);
+-
+-		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+-
+-		    if (_IO_fwide (stderr, 0) > 0)
+-		      __fwprintf (stderr, L"%s", buf);
+-		    else
+-		      fputs (buf, stderr);
+-
+-		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-		    _IO_funlockfile (stderr);
+-
+-		    free (buf);
+-		  }
+-#else
+-		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+-			 argv[0], c);
+-#endif
+-	      }
+-	    d->optopt = c;
+-	    if (optstring[0] == ':')
+-	      c = ':';
+-	    else
+-	      c = '?';
+-	    return c;
+-	  }
+-	else
+-	  /* We already incremented `d->optind' once;
+-	     increment it again when taking next ARGV-elt as argument.  */
+-	  d->optarg = argv[d->optind++];
+-
+-	/* optarg is now the argument, see if it's in the
+-	   table of longopts.  */
+-
+-	for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
+-	     nameend++)
+-	  /* Do nothing.  */ ;
+-
+-	/* Test all long options for either exact match
+-	   or abbreviated matches.  */
+-	for (p = longopts, option_index = 0; p->name; p++, option_index++)
+-	  if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+-	    {
+-	      if ((unsigned int) (nameend - d->__nextchar) ==
+-		  strlen (p->name))
+-		{
+-		  /* Exact match found.  */
+-		  pfound = p;
+-		  indfound = option_index;
+-		  exact = 1;
+-		  break;
+-		}
+-	      else if (pfound == NULL)
+-		{
+-		  /* First nonexact match found.  */
+-		  pfound = p;
+-		  indfound = option_index;
+-		}
+-	      else
+-		/* Second or later nonexact match found.  */
+-		ambig = 1;
+-	    }
+-	if (ambig && !exact)
+-	  {
+-	    if (print_errors)
+-	      {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		char *buf;
+-
+-		if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
+-				argv[0], argv[d->optind]) >= 0)
+-		  {
+-		    _IO_flockfile (stderr);
+-
+-		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+-
+-		    if (_IO_fwide (stderr, 0) > 0)
+-		      __fwprintf (stderr, L"%s", buf);
+-		    else
+-		      fputs (buf, stderr);
+-
+-		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-		    _IO_funlockfile (stderr);
+-
+-		    free (buf);
+-		  }
+-#else
+-		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+-			 argv[0], argv[d->optind]);
+-#endif
+-	      }
+-	    d->__nextchar += strlen (d->__nextchar);
+-	    d->optind++;
+-	    return '?';
+-	  }
+-	if (pfound != NULL)
+-	  {
+-	    option_index = indfound;
+-	    if (*nameend)
+-	      {
+-		/* Don't test has_arg with >, because some C compilers don't
+-		   allow it to be used on enums.  */
+-		if (pfound->has_arg)
+-		  d->optarg = nameend + 1;
+-		else
+-		  {
+-		    if (print_errors)
+-		      {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-			char *buf;
+-
+-			if (__asprintf (&buf, _("\
+-%s: option `-W %s' doesn't allow an argument\n"), argv[0], pfound->name) >= 0)
+-			  {
+-			    _IO_flockfile (stderr);
+-
+-			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-			    ((_IO_FILE *) stderr)->_flags2
+-			      |= _IO_FLAGS2_NOTCANCEL;
+-
+-			    if (_IO_fwide (stderr, 0) > 0)
+-			      __fwprintf (stderr, L"%s", buf);
+-			    else
+-			      fputs (buf, stderr);
+-
+-			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-			    _IO_funlockfile (stderr);
+-
+-			    free (buf);
+-			  }
+-#else
+-			fprintf (stderr, _("\
+-%s: option `-W %s' doesn't allow an argument\n"), argv[0], pfound->name);
+-#endif
+-		      }
+-
+-		    d->__nextchar += strlen (d->__nextchar);
+-		    return '?';
+-		  }
+-	      }
+-	    else if (pfound->has_arg == 1)
+-	      {
+-		if (d->optind < argc)
+-		  d->optarg = argv[d->optind++];
+-		else
+-		  {
+-		    if (print_errors)
+-		      {
+-#if defined _LIBC && defined USE_IN_LIBIO
+-			char *buf;
+-
+-			if (__asprintf (&buf, _("\
+-%s: option `%s' requires an argument\n"), argv[0], argv[d->optind - 1]) >= 0)
+-			  {
+-			    _IO_flockfile (stderr);
+-
+-			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-			    ((_IO_FILE *) stderr)->_flags2
+-			      |= _IO_FLAGS2_NOTCANCEL;
+-
+-			    if (_IO_fwide (stderr, 0) > 0)
+-			      __fwprintf (stderr, L"%s", buf);
+-			    else
+-			      fputs (buf, stderr);
+-
+-			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-			    _IO_funlockfile (stderr);
+-
+-			    free (buf);
+-			  }
+-#else
+-			fprintf (stderr,
+-				 _("%s: option `%s' requires an argument\n"),
+-				 argv[0], argv[d->optind - 1]);
+-#endif
+-		      }
+-		    d->__nextchar += strlen (d->__nextchar);
+-		    return optstring[0] == ':' ? ':' : '?';
+-		  }
+-	      }
+-	    d->__nextchar += strlen (d->__nextchar);
+-	    if (longind != NULL)
+-	      *longind = option_index;
+-	    if (pfound->flag)
+-	      {
+-		*(pfound->flag) = pfound->val;
+-		return 0;
+-	      }
+-	    return pfound->val;
+-	  }
+-	d->__nextchar = NULL;
+-	return 'W';		/* Let the application handle it.   */
+-      }
+-    if (temp[1] == ':')
+-      {
+-	if (temp[2] == ':')
+-	  {
+-	    /* This is an option that accepts an argument optionally.  */
+-	    if (*d->__nextchar != '\0')
+-	      {
+-		d->optarg = d->__nextchar;
+-		d->optind++;
+-	      }
+-	    else
+-	      d->optarg = NULL;
+-	    d->__nextchar = NULL;
+-	  }
+-	else
+-	  {
+-	    /* This is an option that requires an argument.  */
+-	    if (*d->__nextchar != '\0')
+-	      {
+-		d->optarg = d->__nextchar;
+-		/* If we end this ARGV-element by taking the rest as an arg,
+-		   we must advance to the next element now.  */
+-		d->optind++;
+-	      }
+-	    else if (d->optind == argc)
+-	      {
+-		if (print_errors)
+-		  {
+-		    /* 1003.2 specifies the format of this message.  */
+-#if defined _LIBC && defined USE_IN_LIBIO
+-		    char *buf;
+-
+-		    if (__asprintf (&buf, _("\
+-%s: option requires an argument -- %c\n"), argv[0], c) >= 0)
+-		      {
+-			_IO_flockfile (stderr);
+-
+-			int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+-			((_IO_FILE *) stderr)->_flags2 |=
+-			  _IO_FLAGS2_NOTCANCEL;
+-
+-			if (_IO_fwide (stderr, 0) > 0)
+-			  __fwprintf (stderr, L"%s", buf);
+-			else
+-			  fputs (buf, stderr);
+-
+-			((_IO_FILE *) stderr)->_flags2 = old_flags2;
+-			_IO_funlockfile (stderr);
+-
+-			free (buf);
+-		      }
+-#else
+-		    fprintf (stderr,
+-			     _("%s: option requires an argument -- %c\n"),
+-			     argv[0], c);
+-#endif
+-		  }
+-		d->optopt = c;
+-		if (optstring[0] == ':')
+-		  c = ':';
+-		else
+-		  c = '?';
+-	      }
+-	    else
+-	      /* We already incremented `optind' once;
+-	         increment it again when taking next ARGV-elt as argument.  */
+-	      d->optarg = argv[d->optind++];
+-	    d->__nextchar = NULL;
+-	  }
+-      }
+-    return c;
+-  }
+-}
+-
+-int
+-_getopt_internal (
+-  int argc,
+-  char *const *argv,
+-  const char *optstring,
+-  const struct option *longopts,
+-  int *longind,
+-  int long_only
+-)
+-{
+-  int result;
+-
+-  getopt_data.optind = optind;
+-  getopt_data.opterr = opterr;
+-
+-  result = _getopt_internal_r (argc, argv, optstring, longopts,
+-			       longind, long_only, &getopt_data);
+-
+-  optind = getopt_data.optind;
+-  optarg = getopt_data.optarg;
+-  optopt = getopt_data.optopt;
+-
+-  return result;
+-}
+-
+-int
+-getopt (
+-  int argc,
+-  char *const *argv,
+-  const char *optstring
+-)
+-{
+-  return _getopt_internal (argc, argv, optstring,
+-			   (const struct option *) 0, (int *) 0, 0);
+-}
+-
+-#endif /* Not ELIDE_CODE.  */
+-
+-#ifdef TEST
+-
+-/* Compile with -DTEST to make an executable for use in testing
+-   the above definition of `getopt'.  */
+-
+-int
+-main (
+-  int argc,
+-  char **argv
+-)
+-{
+-  int c;
+-  int digit_optind = 0;
+-
+-  while (1)
+-    {
+-      int this_option_optind = optind ? optind : 1;
+-
+-      c = getopt (argc, argv, "abc:d:0123456789");
+-      if (c == -1)
+-	break;
+-
+-      switch (c)
+-	{
+-	case '0':
+-	case '1':
+-	case '2':
+-	case '3':
+-	case '4':
+-	case '5':
+-	case '6':
+-	case '7':
+-	case '8':
+-	case '9':
+-	  if (digit_optind != 0 && digit_optind != this_option_optind)
+-	    printf ("digits occur in two different argv-elements.\n");
+-	  digit_optind = this_option_optind;
+-	  printf ("option %c\n", c);
+-	  break;
+-
+-	case 'a':
+-	  printf ("option a\n");
+-	  break;
+-
+-	case 'b':
+-	  printf ("option b\n");
+-	  break;
+-
+-	case 'c':
+-	  printf ("option c with value `%s'\n", optarg);
+-	  break;
+-
+-	case '?':
+-	  break;
+-
+-	default:
+-	  printf ("?? getopt returned character code 0%o ??\n", c);
+-	}
+-    }
+-
+-  if (optind < argc)
+-    {
+-      printf ("non-option ARGV-elements: ");
+-      while (optind < argc)
+-	printf ("%s ", argv[optind++]);
+-      printf ("\n");
+-    }
+-
+-  exit (0);
+-}
+-
+-#endif /* TEST */
+diff -pruN fribidi-1.0.4.orig/bin/getopt.h fribidi-1.0.4/bin/getopt.h
+--- fribidi-1.0.4.orig/bin/getopt.h	2018-02-03 20:57:13.000000000 +0000
++++ fribidi-1.0.4/bin/getopt.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,187 +0,0 @@
+-/* Declarations for getopt.
+-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+-   Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   This program is free software; you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
+-
+-   This program is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License along
+-   with this program; if not, write to the Free Software Foundation,
+-   Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA.  */
+-
+-#ifndef _GETOPT_H
+-
+-#ifndef __need_getopt
+-# define _GETOPT_H 1
+-#endif
+-
+-/* If __GNU_LIBRARY__ is not already defined, either we are being used
+-   standalone, or this is the first header included in the source file.
+-   If we are being used with glibc, we need to include <features.h>, but
+-   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
+-   not defined, include <ctype.h>, which will pull in <features.h> for us
+-   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
+-   doesn't flood the namespace with stuff the way some other headers do.)  */
+-#if !defined __GNU_LIBRARY__
+-# include <ctype.h>
+-#endif
+-
+-#ifndef __THROW
+-# ifndef __GNUC_PREREQ
+-#  define __GNUC_PREREQ(maj, min) (0)
+-# endif
+-# if defined __cplusplus && __GNUC_PREREQ (2,8)
+-#  define __THROW	throw ()
+-# else
+-#  define __THROW
+-# endif
+-#endif
+-
+-#ifdef	__cplusplus
+-extern "C"
+-{
+-#endif
+-
+-/* For communication from `getopt' to the caller.
+-   When `getopt' finds an option that takes an argument,
+-   the argument value is returned here.
+-   Also, when `ordering' is RETURN_IN_ORDER,
+-   each non-option ARGV-element is returned here.  */
+-
+-  extern char *optarg;
+-
+-/* Index in ARGV of the next element to be scanned.
+-   This is used for communication to and from the caller
+-   and for communication between successive calls to `getopt'.
+-
+-   On entry to `getopt', zero means this is the first call; initialize.
+-
+-   When `getopt' returns -1, this is the index of the first of the
+-   non-option elements that the caller should itself scan.
+-
+-   Otherwise, `optind' communicates from one call to the next
+-   how much of ARGV has been scanned so far.  */
+-
+-  extern int optind;
+-
+-/* Callers store zero here to inhibit the error message `getopt' prints
+-   for unrecognized options.  */
+-
+-  extern int opterr;
+-
+-/* Set to an option character which was unrecognized.  */
+-
+-  extern int optopt;
+-
+-#ifndef __need_getopt
+-/* Describe the long-named options requested by the application.
+-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+-   of `struct option' terminated by an element containing a name which is
+-   zero.
+-
+-   The field `has_arg' is:
+-   no_argument		(or 0) if the option does not take an argument,
+-   required_argument	(or 1) if the option requires an argument,
+-   optional_argument 	(or 2) if the option takes an optional argument.
+-
+-   If the field `flag' is not NULL, it points to a variable that is set
+-   to the value given in the field `val' when the option is found, but
+-   left unchanged if the option is not found.
+-
+-   To have a long-named option do something other than set an `int' to
+-   a compiled-in constant, such as set a value from `optarg', set the
+-   option's `flag' field to zero and its `val' field to a nonzero
+-   value (the equivalent single-letter option character, if there is
+-   one).  For long options that have a zero `flag' field, `getopt'
+-   returns the contents of the `val' field.  */
+-
+-  struct option
+-  {
+-    const char *name;
+-    /* has_arg can't be an enum because some compilers complain about
+-       type mismatches in all the code that assumes it is an int.  */
+-    int has_arg;
+-    int *flag;
+-    int val;
+-  };
+-
+-/* Names for the values of the `has_arg' field of `struct option'.  */
+-
+-# define no_argument		0
+-# define required_argument	1
+-# define optional_argument	2
+-#endif				/* need getopt */
+-
+-
+-/* Get definitions and prototypes for functions to process the
+-   arguments in ARGV (ARGC of them, minus the program name) for
+-   options given in OPTS.
+-
+-   Return the option character from OPTS just read.  Return -1 when
+-   there are no more options.  For unrecognized options, or options
+-   missing arguments, `optopt' is set to the option letter, and '?' is
+-   returned.
+-
+-   The OPTS string is a list of characters which are recognized option
+-   letters, optionally followed by colons, specifying that that letter
+-   takes an argument, to be placed in `optarg'.
+-
+-   If a letter in OPTS is followed by two colons, its argument is
+-   optional.  This behavior is specific to the GNU `getopt'.
+-
+-   The argument `--' causes premature termination of argument
+-   scanning, explicitly telling `getopt' that there are no more
+-   options.
+-
+-   If OPTS begins with `--', then non-option arguments are treated as
+-   arguments to the option '\0'.  This behavior is specific to the GNU
+-   `getopt'.  */
+-
+-#ifdef __GNU_LIBRARY__
+-/* Many other libraries have conflicting prototypes for getopt, with
+-   differences in the consts, in stdlib.h.  To avoid compilation
+-   errors, only prototype getopt for the GNU C library.  */
+-  extern int getopt (
+-  int ___argc,
+-  char *const *___argv,
+-  const char *__shortopts
+-  ) __THROW;
+-#else				/* not __GNU_LIBRARY__ */
+-  extern int getopt (
+-  );
+-#endif				/* __GNU_LIBRARY__ */
+-
+-#ifndef __need_getopt
+-  extern int getopt_long (
+-  int ___argc,
+-  char *const *___argv,
+-  const char *__shortopts,
+-  const struct option *__longopts,
+-  int *__longind
+-  ) __THROW;
+-  extern int getopt_long_only (
+-  int ___argc,
+-  char *const *___argv,
+-  const char *__shortopts,
+-  const struct option *__longopts,
+-  int *__longind
+-  ) __THROW;
+-
+-#endif
+-
+-#ifdef	__cplusplus
+-}
+-#endif
+-
+-/* Make sure we later can get all the definitions and declarations.  */
+-#undef __need_getopt
+-
+-#endif				/* getopt.h */
+diff -pruN fribidi-1.0.4.orig/bin/getopt1.c fribidi-1.0.4/bin/getopt1.c
+--- fribidi-1.0.4.orig/bin/getopt1.c	2018-02-03 20:57:13.000000000 +0000
++++ fribidi-1.0.4/bin/getopt1.c	1970-01-01 00:00:00.000000000 +0000
+@@ -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
+-     Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   This program is free software; you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
+-
+-   This program is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License along
+-   with this program; if not, write to the Free Software Foundation,
+-   Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA.  */
+-
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+-#ifdef _LIBC
+-# include <getopt.h>
+-#else
+-# include "getopt.h"
+-#endif
+-#include "getopt_int.h"
+-
+-#include <stdio.h>
+-
+-/* Comment out all this code if we are using the GNU C Library, and are not
+-   actually compiling the library itself.  This code is part of the GNU C
+-   Library, but also included in many other GNU distributions.  Compiling
+-   and linking in this code is a waste when using the GNU C library
+-   (especially if it is a shared library).  Rather than having every GNU
+-   program understand `configure --with-gnu-libc' and omit the object files,
+-   it is simpler to just do this in the source for each such file.  */
+-
+-#define GETOPT_INTERFACE_VERSION 2
+-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+-#include <gnu-versions.h>
+-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+-#define ELIDE_CODE
+-#endif
+-#endif
+-
+-#ifndef ELIDE_CODE
+-
+-
+-/* This needs to come after some library #include
+-   to get __GNU_LIBRARY__ defined.  */
+-#ifdef __GNU_LIBRARY__
+-#include <stdlib.h>
+-#endif
+-
+-#ifndef	NULL
+-#define NULL 0
+-#endif
+-
+-int
+-getopt_long (
+-  int argc,
+-  char *const *argv,
+-  const char *options,
+-  const struct option *long_options,
+-  int *opt_index
+-)
+-{
+-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+-}
+-
+-int
+-_getopt_long_r (
+-  int argc,
+-  char *const *argv,
+-  const char *options,
+-  const struct option *long_options,
+-  int *opt_index,
+-  struct _getopt_data *d
+-)
+-{
+-  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+-			     0, d);
+-}
+-
+-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+-   If an option that starts with '-' (not '--') doesn't match a long option,
+-   but does match a short option, it is parsed as a short option
+-   instead.  */
+-
+-int
+-getopt_long_only (
+-  int argc,
+-  char *const *argv,
+-  const char *options,
+-  const struct option *long_options,
+-  int *opt_index
+-)
+-{
+-  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+-}
+-
+-int
+-_getopt_long_only_r (
+-  int argc,
+-  char *const *argv,
+-  const char *options,
+-  const struct option *long_options,
+-  int *opt_index,
+-  struct _getopt_data *d
+-)
+-{
+-  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+-			     1, d);
+-}
+-
+-#endif /* Not ELIDE_CODE.  */
+-
+-#ifdef TEST
+-
+-#include <stdio.h>
+-
+-int
+-main (
+-  int argc,
+-  char **argv
+-)
+-{
+-  int c;
+-  int digit_optind = 0;
+-
+-  while (1)
+-    {
+-      int this_option_optind = optind ? optind : 1;
+-      int option_index = 0;
+-      static struct option long_options[] = {
+-	{"add", 1, 0, 0},
+-	{"append", 0, 0, 0},
+-	{"delete", 1, 0, 0},
+-	{"verbose", 0, 0, 0},
+-	{"create", 0, 0, 0},
+-	{"file", 1, 0, 0},
+-	{0, 0, 0, 0}
+-      };
+-
+-      c = getopt_long (argc, argv, "abc:d:0123456789",
+-		       long_options, &option_index);
+-      if (c == -1)
+-	break;
+-
+-      switch (c)
+-	{
+-	case 0:
+-	  printf ("option %s", long_options[option_index].name);
+-	  if (optarg)
+-	    printf (" with arg %s", optarg);
+-	  printf ("\n");
+-	  break;
+-
+-	case '0':
+-	case '1':
+-	case '2':
+-	case '3':
+-	case '4':
+-	case '5':
+-	case '6':
+-	case '7':
+-	case '8':
+-	case '9':
+-	  if (digit_optind != 0 && digit_optind != this_option_optind)
+-	    printf ("digits occur in two different argv-elements.\n");
+-	  digit_optind = this_option_optind;
+-	  printf ("option %c\n", c);
+-	  break;
+-
+-	case 'a':
+-	  printf ("option a\n");
+-	  break;
+-
+-	case 'b':
+-	  printf ("option b\n");
+-	  break;
+-
+-	case 'c':
+-	  printf ("option c with value `%s'\n", optarg);
+-	  break;
+-
+-	case 'd':
+-	  printf ("option d with value `%s'\n", optarg);
+-	  break;
+-
+-	case '?':
+-	  break;
+-
+-	default:
+-	  printf ("?? getopt returned character code 0%o ??\n", c);
+-	}
+-    }
+-
+-  if (optind < argc)
+-    {
+-      printf ("non-option ARGV-elements: ");
+-      while (optind < argc)
+-	printf ("%s ", argv[optind++]);
+-      printf ("\n");
+-    }
+-
+-  exit (0);
+-}
+-
+-#endif /* TEST */
+diff -pruN fribidi-1.0.4.orig/bin/getopt_int.h fribidi-1.0.4/bin/getopt_int.h
+--- fribidi-1.0.4.orig/bin/getopt_int.h	2018-02-03 20:57:13.000000000 +0000
++++ fribidi-1.0.4/bin/getopt_int.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,145 +0,0 @@
+-/* Internal declarations for getopt.
+-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+-   Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   This program is free software; you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 2, or (at your option)
+-   any later version.
+-
+-   This program is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License along
+-   with this program; if not, write to the Free Software Foundation,
+-   Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301, USA.  */
+-
+-#ifndef _GETOPT_INT_H
+-#define _GETOPT_INT_H	1
+-
+-extern int _getopt_internal (
+-  int ___argc,
+-  char *const *___argv,
+-  const char *__shortopts,
+-  const struct option *__longopts,
+-  int *__longind,
+-  int __long_only
+-);
+-
+-
+-/* Reentrant versions which can handle parsing multiple argument
+-   vectors at the same time.  */
+-
+-/* Data type for reentrant functions.  */
+-struct _getopt_data
+-{
+-  /* These have exactly the same meaning as the corresponding global
+-     variables, except that they are used for the reentrant
+-     versions of getopt.  */
+-  int optind;
+-  int opterr;
+-  int optopt;
+-  char *optarg;
+-
+-  /* Internal members.  */
+-
+-  /* True if the internal members have been initialized.  */
+-  int __initialized;
+-
+-  /* The next char to be scanned in the option-element
+-     in which the last option character we returned was found.
+-     This allows us to pick up the scan where we left off.
+-
+-     If this is zero, or a null string, it means resume the scan
+-     by advancing to the next ARGV-element.  */
+-  char *__nextchar;
+-
+-  /* Describe how to deal with options that follow non-option ARGV-elements.
+-
+-     If the caller did not specify anything,
+-     the default is REQUIRE_ORDER if the environment variable
+-     POSIXLY_CORRECT is defined, PERMUTE otherwise.
+-
+-     REQUIRE_ORDER means don't recognize them as options;
+-     stop option processing when the first non-option is seen.
+-     This is what Unix does.
+-     This mode of operation is selected by either setting the environment
+-     variable POSIXLY_CORRECT, or using `+' as the first character
+-     of the list of option characters.
+-
+-     PERMUTE is the default.  We permute the contents of ARGV as we
+-     scan, so that eventually all the non-options are at the end.
+-     This allows options to be given in any order, even with programs
+-     that were not written to expect this.
+-
+-     RETURN_IN_ORDER is an option available to programs that were
+-     written to expect options and other ARGV-elements in any order
+-     and that care about the ordering of the two.  We describe each
+-     non-option ARGV-element as if it were the argument of an option
+-     with character code 1.  Using `-' as the first character of the
+-     list of option characters selects this mode of operation.
+-
+-     The special argument `--' forces an end of option-scanning regardless
+-     of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+-     `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+-
+-  enum
+-  {
+-    REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+-  } __ordering;
+-
+-  /* If the POSIXLY_CORRECT environment variable is set.  */
+-  int __posixly_correct;
+-
+-
+-  /* Handle permutation of arguments.  */
+-
+-  /* Describe the part of ARGV that contains non-options that have
+-     been skipped.  `first_nonopt' is the index in ARGV of the first
+-     of them; `last_nonopt' is the index after the last of them.  */
+-
+-  int __first_nonopt;
+-  int __last_nonopt;
+-
+-#if defined _LIBC && defined USE_NONOPTION_FLAGS
+-  int __nonoption_flags_max_len;
+-  int __nonoption_flags_len;
+-# endif
+-};
+-
+-/* The initializer is necessary to set OPTIND and OPTERR to their
+-   default values and to clear the initialization flag.  */
+-#define _GETOPT_DATA_INITIALIZER	{ 1, 1 }
+-
+-extern int _getopt_internal_r (
+-  int ___argc,
+-  char *const *___argv,
+-  const char *__shortopts,
+-  const struct option *__longopts,
+-  int *__longind,
+-  int __long_only,
+-  struct _getopt_data *__data
+-);
+-
+-extern int _getopt_long_r (
+-  int ___argc,
+-  char *const *___argv,
+-  const char *__shortopts,
+-  const struct option *__longopts,
+-  int *__longind,
+-  struct _getopt_data *__data
+-);
+-
+-extern int _getopt_long_only_r (
+-  int ___argc,
+-  char *const *___argv,
+-  const char *__shortopts,
+-  const struct option *__longopts,
+-  int *__longind,
+-  struct _getopt_data *__data
+-);
+-
+-#endif /* getopt_int.h */
+diff -pruN fribidi-1.0.4.orig/bin/gettext.h fribidi-1.0.4/bin/gettext.h
+--- fribidi-1.0.4.orig/bin/gettext.h	2018-02-03 20:57:13.000000000 +0000
++++ fribidi-1.0.4/bin/gettext.h	1970-01-01 00:00:00.000000000 +0000
+@@ -1,2 +0,0 @@
+-#undef gettext
+-#define gettext
diff --git a/fribidi.spec b/fribidi.spec
index e09d941..38a60bb 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,11 +1,12 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 BuildRequires: gcc
+Patch0: %{name}-drop-bundled-gnulib.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -21,7 +22,8 @@ Include files and libraries needed for developing applications which use
 FriBidi.
 
 %prep
-%autosetup
+%autosetup -p1
+autoreconf -i
 
 %build
 %if 0%{?el5}
@@ -61,6 +63,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jul 26 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-6
+- Drop bundled gnulib code.
+
 * Tue Jul 17 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-5
 - Add BR: gcc.
 

From d739a58da00972104e3671cbc9ad93b7a6aefe29 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 26 Jul 2018 10:09:42 +0000
Subject: [PATCH 43/85] Drop bundled gnulib code.

---
 fribidi.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fribidi.spec b/fribidi.spec
index 38a60bb..f791acf 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -6,6 +6,7 @@ URL: https://github.com/fribidi/fribidi/
 Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 BuildRequires: gcc
+BuildRequires: automake autoconf libtool
 Patch0: %{name}-drop-bundled-gnulib.patch
 
 %description

From 82e1cb86a1423349ee61c02d089b2b5a139ed7d6 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 6 Aug 2018 10:35:09 +0000
Subject: [PATCH 44/85] New upstream release. (#1609080)

---
 .gitignore   | 1 +
 fribidi.spec | 9 ++++++---
 sources      | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58717e0..113626d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /fribidi-1.0.2.tar.bz2
 /fribidi-1.0.3.tar.bz2
 /fribidi-1.0.4.tar.bz2
+/fribidi-1.0.5.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index f791acf..93bb6e6 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,9 +1,9 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.4
-Release: 6%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
-Source: https://github.com//%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 BuildRequires: gcc
 BuildRequires: automake autoconf libtool
@@ -64,6 +64,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Mon Aug 06 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.5-1
+- New upstream release. (#1609080)
+
 * Thu Jul 26 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-6
 - Drop bundled gnulib code.
 
diff --git a/sources b/sources
index bb491aa..c8e61d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (fribidi-1.0.3.tar.bz2) = 2891f08824f2be60445d30cdb7e256d489d0e13642a80c3b6d1a492e9ad644b8f6c2d2826512b61ff9fa1616e24678d365ac1247fa5a8d95633f8cfbd9376965
-SHA512 (fribidi-1.0.4.tar.bz2) = 435bd48c48ec3c2dc1f1266e401abdbd400d2202b55df6367dbe84580c21e4aa73205058324cf630dfec365733d3e0ac186d14608baa1c9f63231875fb7cc525
+SHA512 (fribidi-1.0.5.tar.bz2) = c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2

From 4809bf100ca03f995f39c82548b335ff1736e759 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 20:12:49 +0000
Subject: [PATCH 45/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_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 93bb6e6..ead5248 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.5
-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.bz2
 License: LGPLv2+ and UCD
@@ -64,6 +64,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Aug 06 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.5-1
 - New upstream release. (#1609080)
 

From e35e6248e770c96e5aaa896de6b29e9569a7d0d5 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 23 Jul 2019 07:25:21 +0000
Subject: [PATCH 46/85] Backport upstream patch to remove HAVE_CONFIG_H from
 public API.   Fixes rhbz#1730516

---
 fribidi-remove-config-h-from-public-api.patch | 231 ++++++++++++++++++
 fribidi.spec                                  |   7 +-
 2 files changed, 237 insertions(+), 1 deletion(-)
 create mode 100644 fribidi-remove-config-h-from-public-api.patch

diff --git a/fribidi-remove-config-h-from-public-api.patch b/fribidi-remove-config-h-from-public-api.patch
new file mode 100644
index 0000000..511d2f7
--- /dev/null
+++ b/fribidi-remove-config-h-from-public-api.patch
@@ -0,0 +1,231 @@
+From b534ab2642f694c3106d5bc8d0a8beae60bf60d3 Mon Sep 17 00:00:00 2001
+From: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sat, 18 Aug 2018 20:37:22 +0300
+Subject: [PATCH] Removed HAVE_CONFIG_H from public API
+
+---
+ bin/fribidi-benchmark.c          | 5 +++++
+ bin/fribidi-main.c               | 5 +++++
+ gen.tab/gen-arabic-shaping-tab.c | 4 ++++
+ gen.tab/gen-bidi-type-tab.c      | 4 ++++
+ gen.tab/gen-brackets-tab.c       | 4 ++++
+ gen.tab/gen-brackets-type-tab.c  | 4 ++++
+ gen.tab/gen-joining-type-tab.c   | 4 ++++
+ gen.tab/gen-mirroring-tab.c      | 4 ++++
+ gen.tab/gen-unicode-version.c    | 4 ++++
+ lib/bidi-types.h                 | 2 +-
+ lib/fribidi-arabic.c             | 4 ++++
+ lib/fribidi-types.h              | 4 ----
+ lib/joining-types.h              | 2 +-
+ lib/run.h                        | 2 +-
+ 14 files changed, 45 insertions(+), 7 deletions(-)
+
+diff --git a/bin/fribidi-benchmark.c b/bin/fribidi-benchmark.c
+index e5fc9c0..07ac336 100644
+--- a/bin/fribidi-benchmark.c
++++ b/bin/fribidi-benchmark.c
+@@ -33,6 +33,11 @@
+ #include <fribidi-deprecated.h>
+ 
+ #include <stdio.h>
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
+index cd359a9..33e1630 100644
+--- a/bin/fribidi-main.c
++++ b/bin/fribidi-main.c
+@@ -33,6 +33,11 @@
+ #include <fribidi-deprecated.h>
+ 
+ #include <stdio.h>
++
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/gen.tab/gen-arabic-shaping-tab.c b/gen.tab/gen-arabic-shaping-tab.c
+index e613768..369501c 100644
+--- a/gen.tab/gen-arabic-shaping-tab.c
++++ b/gen.tab/gen-arabic-shaping-tab.c
+@@ -30,6 +30,10 @@
+ #include <fribidi-unicode.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c
+index a0a61ef..05b1d16 100644
+--- a/gen.tab/gen-bidi-type-tab.c
++++ b/gen.tab/gen-bidi-type-tab.c
+@@ -30,6 +30,10 @@
+ #include <fribidi-unicode.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/gen.tab/gen-brackets-tab.c b/gen.tab/gen-brackets-tab.c
+index 8c1f1df..cd99e01 100644
+--- a/gen.tab/gen-brackets-tab.c
++++ b/gen.tab/gen-brackets-tab.c
+@@ -32,6 +32,10 @@
+ #include <fribidi-unicode.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/gen.tab/gen-brackets-type-tab.c b/gen.tab/gen-brackets-type-tab.c
+index 221db07..9ec60cc 100644
+--- a/gen.tab/gen-brackets-type-tab.c
++++ b/gen.tab/gen-brackets-type-tab.c
+@@ -32,6 +32,10 @@
+ #include <fribidi-unicode.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/gen.tab/gen-joining-type-tab.c b/gen.tab/gen-joining-type-tab.c
+index 07c0953..29ab3ed 100644
+--- a/gen.tab/gen-joining-type-tab.c
++++ b/gen.tab/gen-joining-type-tab.c
+@@ -30,6 +30,10 @@
+ #include <fribidi-unicode.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c
+index 21d33cf..e19be91 100644
+--- a/gen.tab/gen-mirroring-tab.c
++++ b/gen.tab/gen-mirroring-tab.c
+@@ -30,6 +30,10 @@
+ #include <fribidi-unicode.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/gen.tab/gen-unicode-version.c b/gen.tab/gen-unicode-version.c
+index 4291551..35306ca 100644
+--- a/gen.tab/gen-unicode-version.c
++++ b/gen.tab/gen-unicode-version.c
+@@ -28,6 +28,10 @@
+ #include <common.h>
+ 
+ #include <stdio.h>
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+diff --git a/lib/bidi-types.h b/lib/bidi-types.h
+index 385ef05..86f3d02 100644
+--- a/lib/bidi-types.h
++++ b/lib/bidi-types.h
+@@ -27,7 +27,7 @@
+ #ifndef _BIDI_TYPES_H
+ #define _BIDI_TYPES_H
+ 
+-#include "common.h"
++#include "fribidi-common.h"
+ 
+ #include <fribidi-types.h>
+ #include <fribidi-bidi-types.h>
+diff --git a/lib/fribidi-arabic.c b/lib/fribidi-arabic.c
+index dbfdc09..e12074c 100644
+--- a/lib/fribidi-arabic.c
++++ b/lib/fribidi-arabic.c
+@@ -27,6 +27,10 @@
+ 
+ #include "common.h"
+ 
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h
+index 9f1746f..90238b4 100644
+--- a/lib/fribidi-types.h
++++ b/lib/fribidi-types.h
+@@ -27,10 +27,6 @@
+ #ifndef _FRIBIDI_TYPES_H
+ #define _FRIBIDI_TYPES_H
+ 
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+ #include "fribidi-common.h"
+ 
+ #include "fribidi-begindecls.h"
+diff --git a/lib/joining-types.h b/lib/joining-types.h
+index 94b9fe3..6e11fa1 100644
+--- a/lib/joining-types.h
++++ b/lib/joining-types.h
+@@ -27,7 +27,7 @@
+ #ifndef _JOINING_TYPES_H
+ #define _JOINING_TYPES_H
+ 
+-#include "common.h"
++#include "fribidi-common.h"
+ 
+ #include <fribidi-types.h>
+ #include <fribidi-joining-types.h>
+diff --git a/lib/run.h b/lib/run.h
+index 8c4e259..44ddfec 100644
+--- a/lib/run.h
++++ b/lib/run.h
+@@ -29,7 +29,7 @@
+ #ifndef _RUN_H
+ #define _RUN_H
+ 
+-#include "common.h"
++#include "fribidi-common.h"
+ 
+ #include <fribidi-common.h>
+ 
+-- 
+2.21.0
+
diff --git a/fribidi.spec b/fribidi.spec
index ead5248..444311f 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,13 +1,14 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.5
-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.bz2
 License: LGPLv2+ and UCD
 BuildRequires: gcc
 BuildRequires: automake autoconf libtool
 Patch0: %{name}-drop-bundled-gnulib.patch
+Patch1: %{name}-remove-config-h-from-public-api.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -64,6 +65,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Tue Jul 23 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.5-3
+- Backport upstream patch to remove HAVE_CONFIG_H from public API.
+  Fixes rhbz#1730516
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 836ee14da0823da063235a509db5148d6576dbdb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 01:05:06 +0000
Subject: [PATCH 47/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_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 444311f..01c4b4f 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.5
-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.bz2
 License: LGPLv2+ and UCD
@@ -65,6 +65,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Jul 23 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.5-3
 - Backport upstream patch to remove HAVE_CONFIG_H from public API.
   Fixes rhbz#1730516

From e1d47af3489ef5b1d49c4c938684e94166cf3b9c Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 27 Sep 2019 17:23:27 +0900
Subject: [PATCH 48/85] New upstream release.   Resolves: rhbz#1756212

---
 .gitignore   |  1 +
 fribidi.spec | 10 +++++++---
 sources      |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 113626d..b8b9949 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /fribidi-1.0.3.tar.bz2
 /fribidi-1.0.4.tar.bz2
 /fribidi-1.0.5.tar.bz2
+/fribidi-1.0.6.tar.gz
diff --git a/fribidi.spec b/fribidi.spec
index 01c4b4f..419aa28 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,9 +1,9 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.5
-Release: 4%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
-Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 License: LGPLv2+ and UCD
 BuildRequires: gcc
 BuildRequires: automake autoconf libtool
@@ -65,6 +65,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.gz
 
 %changelog
+* Fri Sep 27 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.6-1
+- New upstream release.
+  Resolves: rhbz#1756212
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index c8e61d3..cf90a16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fribidi-1.0.5.tar.bz2) = c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
+SHA512 (fribidi-1.0.6.tar.gz) = 756bdd98292ac52b35c46bc2c6ec97421250c7c4b5770d81884c73534b16141db27bd7331f0a52c99a78fa27eaafb842981bf152b21b3c9cdcd270d32e6324a5

From fc99f465b1139b40feb83f90fa3742ef4f9f032f Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 27 Sep 2019 17:27:50 +0900
Subject: [PATCH 49/85] New upstream release.   Resolves: rhbz#1756212

---
 fribidi-remove-config-h-from-public-api.patch | 231 ------------------
 fribidi.spec                                  |   1 -
 2 files changed, 232 deletions(-)
 delete mode 100644 fribidi-remove-config-h-from-public-api.patch

diff --git a/fribidi-remove-config-h-from-public-api.patch b/fribidi-remove-config-h-from-public-api.patch
deleted file mode 100644
index 511d2f7..0000000
--- a/fribidi-remove-config-h-from-public-api.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From b534ab2642f694c3106d5bc8d0a8beae60bf60d3 Mon Sep 17 00:00:00 2001
-From: Dov Grobgeld <dov.grobgeld@gmail.com>
-Date: Sat, 18 Aug 2018 20:37:22 +0300
-Subject: [PATCH] Removed HAVE_CONFIG_H from public API
-
----
- bin/fribidi-benchmark.c          | 5 +++++
- bin/fribidi-main.c               | 5 +++++
- gen.tab/gen-arabic-shaping-tab.c | 4 ++++
- gen.tab/gen-bidi-type-tab.c      | 4 ++++
- gen.tab/gen-brackets-tab.c       | 4 ++++
- gen.tab/gen-brackets-type-tab.c  | 4 ++++
- gen.tab/gen-joining-type-tab.c   | 4 ++++
- gen.tab/gen-mirroring-tab.c      | 4 ++++
- gen.tab/gen-unicode-version.c    | 4 ++++
- lib/bidi-types.h                 | 2 +-
- lib/fribidi-arabic.c             | 4 ++++
- lib/fribidi-types.h              | 4 ----
- lib/joining-types.h              | 2 +-
- lib/run.h                        | 2 +-
- 14 files changed, 45 insertions(+), 7 deletions(-)
-
-diff --git a/bin/fribidi-benchmark.c b/bin/fribidi-benchmark.c
-index e5fc9c0..07ac336 100644
---- a/bin/fribidi-benchmark.c
-+++ b/bin/fribidi-benchmark.c
-@@ -33,6 +33,11 @@
- #include <fribidi-deprecated.h>
- 
- #include <stdio.h>
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
-index cd359a9..33e1630 100644
---- a/bin/fribidi-main.c
-+++ b/bin/fribidi-main.c
-@@ -33,6 +33,11 @@
- #include <fribidi-deprecated.h>
- 
- #include <stdio.h>
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/gen.tab/gen-arabic-shaping-tab.c b/gen.tab/gen-arabic-shaping-tab.c
-index e613768..369501c 100644
---- a/gen.tab/gen-arabic-shaping-tab.c
-+++ b/gen.tab/gen-arabic-shaping-tab.c
-@@ -30,6 +30,10 @@
- #include <fribidi-unicode.h>
- 
- #include <stdio.h>
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c
-index a0a61ef..05b1d16 100644
---- a/gen.tab/gen-bidi-type-tab.c
-+++ b/gen.tab/gen-bidi-type-tab.c
-@@ -30,6 +30,10 @@
- #include <fribidi-unicode.h>
- 
- #include <stdio.h>
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/gen.tab/gen-brackets-tab.c b/gen.tab/gen-brackets-tab.c
-index 8c1f1df..cd99e01 100644
---- a/gen.tab/gen-brackets-tab.c
-+++ b/gen.tab/gen-brackets-tab.c
-@@ -32,6 +32,10 @@
- #include <fribidi-unicode.h>
- 
- #include <stdio.h>
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/gen.tab/gen-brackets-type-tab.c b/gen.tab/gen-brackets-type-tab.c
-index 221db07..9ec60cc 100644
---- a/gen.tab/gen-brackets-type-tab.c
-+++ b/gen.tab/gen-brackets-type-tab.c
-@@ -32,6 +32,10 @@
- #include <fribidi-unicode.h>
- 
- #include <stdio.h>
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/gen.tab/gen-joining-type-tab.c b/gen.tab/gen-joining-type-tab.c
-index 07c0953..29ab3ed 100644
---- a/gen.tab/gen-joining-type-tab.c
-+++ b/gen.tab/gen-joining-type-tab.c
-@@ -30,6 +30,10 @@
- #include <fribidi-unicode.h>
- 
- #include <stdio.h>
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c
-index 21d33cf..e19be91 100644
---- a/gen.tab/gen-mirroring-tab.c
-+++ b/gen.tab/gen-mirroring-tab.c
-@@ -30,6 +30,10 @@
- #include <fribidi-unicode.h>
- 
- #include <stdio.h>
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/gen.tab/gen-unicode-version.c b/gen.tab/gen-unicode-version.c
-index 4291551..35306ca 100644
---- a/gen.tab/gen-unicode-version.c
-+++ b/gen.tab/gen-unicode-version.c
-@@ -28,6 +28,10 @@
- #include <common.h>
- 
- #include <stdio.h>
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
-diff --git a/lib/bidi-types.h b/lib/bidi-types.h
-index 385ef05..86f3d02 100644
---- a/lib/bidi-types.h
-+++ b/lib/bidi-types.h
-@@ -27,7 +27,7 @@
- #ifndef _BIDI_TYPES_H
- #define _BIDI_TYPES_H
- 
--#include "common.h"
-+#include "fribidi-common.h"
- 
- #include <fribidi-types.h>
- #include <fribidi-bidi-types.h>
-diff --git a/lib/fribidi-arabic.c b/lib/fribidi-arabic.c
-index dbfdc09..e12074c 100644
---- a/lib/fribidi-arabic.c
-+++ b/lib/fribidi-arabic.c
-@@ -27,6 +27,10 @@
- 
- #include "common.h"
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
-diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h
-index 9f1746f..90238b4 100644
---- a/lib/fribidi-types.h
-+++ b/lib/fribidi-types.h
-@@ -27,10 +27,6 @@
- #ifndef _FRIBIDI_TYPES_H
- #define _FRIBIDI_TYPES_H
- 
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
- #include "fribidi-common.h"
- 
- #include "fribidi-begindecls.h"
-diff --git a/lib/joining-types.h b/lib/joining-types.h
-index 94b9fe3..6e11fa1 100644
---- a/lib/joining-types.h
-+++ b/lib/joining-types.h
-@@ -27,7 +27,7 @@
- #ifndef _JOINING_TYPES_H
- #define _JOINING_TYPES_H
- 
--#include "common.h"
-+#include "fribidi-common.h"
- 
- #include <fribidi-types.h>
- #include <fribidi-joining-types.h>
-diff --git a/lib/run.h b/lib/run.h
-index 8c4e259..44ddfec 100644
---- a/lib/run.h
-+++ b/lib/run.h
-@@ -29,7 +29,7 @@
- #ifndef _RUN_H
- #define _RUN_H
- 
--#include "common.h"
-+#include "fribidi-common.h"
- 
- #include <fribidi-common.h>
- 
--- 
-2.21.0
-
diff --git a/fribidi.spec b/fribidi.spec
index 419aa28..245ecbf 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -8,7 +8,6 @@ License: LGPLv2+ and UCD
 BuildRequires: gcc
 BuildRequires: automake autoconf libtool
 Patch0: %{name}-drop-bundled-gnulib.patch
-Patch1: %{name}-remove-config-h-from-public-api.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),

From 10360073ba5d775a03eb0f5563abb1aeabf4fd3d Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 27 Sep 2019 18:38:00 +0900
Subject: [PATCH 50/85] New upstream release.   Resolves: rhbz#1756212 Use
 meson to build.

---
 fribidi-drop-bundled-gnulib.patch | 54 ++++++++++++++++++++-----------
 fribidi.spec                      | 27 ++++++++++++++--
 2 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/fribidi-drop-bundled-gnulib.patch b/fribidi-drop-bundled-gnulib.patch
index fc020d4..04c42f9 100644
--- a/fribidi-drop-bundled-gnulib.patch
+++ b/fribidi-drop-bundled-gnulib.patch
@@ -1,6 +1,6 @@
-diff -pruN fribidi-1.0.4.orig/bin/Makefile.am fribidi-1.0.4/bin/Makefile.am
---- fribidi-1.0.4.orig/bin/Makefile.am	2018-02-19 21:25:06.000000000 +0000
-+++ fribidi-1.0.4/bin/Makefile.am	2018-07-26 09:53:02.746415439 +0000
+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
 @@ -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.4.orig/bin/Makefile.am fribidi-1.0.4/bin/Makefile.am
  
  AM_CPPFLAGS = \
  		-I$(top_builddir)/lib \
-diff -pruN fribidi-1.0.4.orig/bin/getopt.c fribidi-1.0.4/bin/getopt.c
---- fribidi-1.0.4.orig/bin/getopt.c	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt.c	1970-01-01 00:00:00.000000000 +0000
+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
 @@ -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.4.orig/bin/getopt.c fribidi-1.0.4/bin/getopt.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.4.orig/bin/getopt.h fribidi-1.0.4/bin/getopt.h
---- fribidi-1.0.4.orig/bin/getopt.h	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt.h	1970-01-01 00:00:00.000000000 +0000
+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
 @@ -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.4.orig/bin/getopt.h fribidi-1.0.4/bin/getopt.h
 -#undef __need_getopt
 -
 -#endif				/* getopt.h */
-diff -pruN fribidi-1.0.4.orig/bin/getopt1.c fribidi-1.0.4/bin/getopt1.c
---- fribidi-1.0.4.orig/bin/getopt1.c	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt1.c	1970-01-01 00:00:00.000000000 +0000
+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
 @@ -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.4.orig/bin/getopt1.c fribidi-1.0.4/bin/getopt1.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.4.orig/bin/getopt_int.h fribidi-1.0.4/bin/getopt_int.h
---- fribidi-1.0.4.orig/bin/getopt_int.h	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt_int.h	1970-01-01 00:00:00.000000000 +0000
+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
 @@ -1,145 +0,0 @@
 -/* Internal declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@@ -1844,9 +1844,27 @@ diff -pruN fribidi-1.0.4.orig/bin/getopt_int.h fribidi-1.0.4/bin/getopt_int.h
 -);
 -
 -#endif /* getopt_int.h */
-diff -pruN fribidi-1.0.4.orig/bin/gettext.h fribidi-1.0.4/bin/gettext.h
---- fribidi-1.0.4.orig/bin/gettext.h	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/gettext.h	1970-01-01 00:00:00.000000000 +0000
+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
 @@ -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
+@@ -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,
+   include_directories: incs,
+   link_with: libfribidi,
+   install: true)
+ 
+ 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,
+   include_directories: incs,
+   link_with: libfribidi,
diff --git a/fribidi.spec b/fribidi.spec
index 245ecbf..961beb3 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -6,8 +6,13 @@ URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 License: LGPLv2+ and UCD
 BuildRequires: gcc
+%if 0%{?rhel} && 0%{?rhel} <= 8
 BuildRequires: automake autoconf libtool
+%else
+BuildRequires: meson
+%endif
 Patch0: %{name}-drop-bundled-gnulib.patch
+Patch1: %{name}-automake.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -24,9 +29,12 @@ FriBidi.
 
 %prep
 %autosetup -p1
+%if 0%{?rhel} && 0%{?rhel} <= 8
 autoreconf -i
+%endif
 
 %build
+%if 0%{?rhel} && 0%{?rhel} <= 8
 %if 0%{?el5}
 # FORTIFY_SOURCE=2 breaks EL-5 build
 export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|'`
@@ -40,19 +48,31 @@ export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
 %endif
 %configure --disable-static --disable-docs
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
+%else
+%meson -Ddocs=false
+%meson_build
+%endif
 
 %check
+%if 0%{?rhel} && 0%{?rhel} <= 8
 make check
+%else
+%meson_test
+%endif
 
 %install
+%if 0%{?rhel} && 0%{?rhel} <= 8
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
+%else
+%meson_install
+%endif
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %ldconfig_scriptlets
 
 %files
-%doc README AUTHORS ChangeLog THANKS NEWS TODO
+%doc README.md AUTHORS THANKS NEWS TODO
 %license COPYING
 %{_bindir}/fribidi
 %{_libdir}/libfribidi.so.0*
@@ -61,12 +81,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/fribidi
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/*.gz
+#%%{_mandir}/man3/*.gz
 
 %changelog
 * Fri Sep 27 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.6-1
 - New upstream release.
   Resolves: rhbz#1756212
+- Use meson to build.
 
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

From c399ec5f70f8148e99555b0d2cd51b08f432cf84 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 27 Sep 2019 18:38:15 +0900
Subject: [PATCH 51/85] New upstream release.   Resolves: rhbz#1756212 Use
 meson to build.

---
 fribidi-automake.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 fribidi-automake.patch

diff --git a/fribidi-automake.patch b/fribidi-automake.patch
new file mode 100644
index 0000000..a634e29
--- /dev/null
+++ b/fribidi-automake.patch
@@ -0,0 +1,12 @@
+diff -pruN fribidi-1.0.6.orig/gen.tab/Makefile.am fribidi-1.0.6/gen.tab/Makefile.am
+--- fribidi-1.0.6.orig/gen.tab/Makefile.am	2019-09-27 14:03:47.000000000 +0900
++++ fribidi-1.0.6/gen.tab/Makefile.am	2019-09-27 17:42:00.196295996 +0900
+@@ -25,7 +25,7 @@ gen_brackets_type_tab_CPPFLAGS = $(AM_CP
+ 
+ CFLAGS_FOR_BUILD += -DHAVE_CONFIG_H -I$(top_builddir) -I$(top_builddir)/lib -I$(top_srcdir)/lib
+ CC = $(CC_FOR_BUILD)
+-CFLAGS = $(CFLAGS_FOR_BUILD)
++AM_CFLAGS = $(CFLAGS_FOR_BUILD)
+ 
+ CLEANFILES = $(EXTRA_PROGRAMS)
+ DISTCLEANFILES =

From 2d8c8c6c2f14592b81c78382574e9106ca45750c Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 30 Sep 2019 21:05:49 +0900
Subject: [PATCH 52/85] New upstream release.   Resolves: rhbz#1756434

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

diff --git a/.gitignore b/.gitignore
index b8b9949..ed5eb9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /fribidi-1.0.4.tar.bz2
 /fribidi-1.0.5.tar.bz2
 /fribidi-1.0.6.tar.gz
+/fribidi-1.0.7.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index 961beb3..56b30d8 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,9 +1,9 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.6
+Version: 1.0.7
 Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
-Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
 BuildRequires: gcc
 %if 0%{?rhel} && 0%{?rhel} <= 8
@@ -72,7 +72,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %ldconfig_scriptlets
 
 %files
-%doc README.md AUTHORS THANKS NEWS TODO
+%doc README AUTHORS ChangeLog THANKS NEWS TODO
 %license COPYING
 %{_bindir}/fribidi
 %{_libdir}/libfribidi.so.0*
@@ -84,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Mon Sep 30 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.7-1
+- New upstream release.
+  Resolves: rhbz#1756434
+
 * Fri Sep 27 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.6-1
 - New upstream release.
   Resolves: rhbz#1756212
diff --git a/sources b/sources
index cf90a16..ca0f522 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (fribidi-1.0.6.tar.gz) = 756bdd98292ac52b35c46bc2c6ec97421250c7c4b5770d81884c73534b16141db27bd7331f0a52c99a78fa27eaafb842981bf152b21b3c9cdcd270d32e6324a5
+SHA512 (fribidi-1.0.7.tar.bz2) = c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0

From edee4f681707b139b3bc2133d0cb2cb7ad166079 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 11 Dec 2019 13:51:20 +0900
Subject: [PATCH 53/85] Fix CVE-2019-18397   Resolves: rhbz#1781218

---
 fribidi-CVE-2019-18397.patch | 27 +++++++++++++++++++++++++++
 fribidi.spec                 |  7 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 fribidi-CVE-2019-18397.patch

diff --git a/fribidi-CVE-2019-18397.patch b/fribidi-CVE-2019-18397.patch
new file mode 100644
index 0000000..a734a87
--- /dev/null
+++ b/fribidi-CVE-2019-18397.patch
@@ -0,0 +1,27 @@
+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.spec b/fribidi.spec
index 56b30d8..ddf2ad7 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.7
-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.bz2
 License: LGPLv2+ and UCD
@@ -13,6 +13,7 @@ BuildRequires: meson
 %endif
 Patch0: %{name}-drop-bundled-gnulib.patch
 Patch1: %{name}-automake.patch
+Patch2: %{name}-CVE-2019-18397.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -84,6 +85,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Dec 11 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.7-2
+- Fix CVE-2019-18397
+  Resolves: rhbz#1781218
+
 * Mon Sep 30 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.7-1
 - New upstream release.
   Resolves: rhbz#1756434

From 0c63ce47c43d367cca88e34fc2bd7bdaba8acea0 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Fri, 13 Dec 2019 19:35:56 +0900
Subject: [PATCH 54/85] New upstream release.   Resolves: rhbz#1783205

---
 .gitignore   | 1 +
 fribidi.spec | 9 ++++++---
 sources      | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed5eb9a..dd8378c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /fribidi-1.0.5.tar.bz2
 /fribidi-1.0.6.tar.gz
 /fribidi-1.0.7.tar.bz2
+/fribidi-1.0.8.tar.bz2
diff --git a/fribidi.spec b/fribidi.spec
index ddf2ad7..ea1cab6 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.7
-Release: 2%{?dist}
+Version: 1.0.8
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 License: LGPLv2+ and UCD
@@ -13,7 +13,6 @@ BuildRequires: meson
 %endif
 Patch0: %{name}-drop-bundled-gnulib.patch
 Patch1: %{name}-automake.patch
-Patch2: %{name}-CVE-2019-18397.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -85,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Fri Dec 13 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.8-1
+- New upstream release.
+  Resolves: rhbz#1783205
+
 * Wed Dec 11 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.7-2
 - Fix CVE-2019-18397
   Resolves: rhbz#1781218
diff --git a/sources b/sources
index ca0f522..96e8d08 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (fribidi-1.0.6.tar.gz) = 756bdd98292ac52b35c46bc2c6ec97421250c7c4b5770d81884c73534b16141db27bd7331f0a52c99a78fa27eaafb842981bf152b21b3c9cdcd270d32e6324a5
-SHA512 (fribidi-1.0.7.tar.bz2) = c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0
+SHA512 (fribidi-1.0.8.tar.bz2) = d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2

From 2f5bf1f16f111b244ec9bf62bdd466ca8bed4f80 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 15 Jan 2020 17:12:12 +0900
Subject: [PATCH 55/85] Restore the deprecated API that was accidentally
 removed in the previous release.   Resolves: rhbz#1787293

---
 fribidi.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fribidi.spec b/fribidi.spec
index ea1cab6..3ad3995 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.8
-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.bz2
 License: LGPLv2+ and UCD
@@ -13,6 +13,7 @@ BuildRequires: meson
 %endif
 Patch0: %{name}-drop-bundled-gnulib.patch
 Patch1: %{name}-automake.patch
+Patch2: %{name}-restore-deprecated-api.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -84,6 +85,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Wed Jan 15 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.8-2
+- Restore the deprecated API that was accidentally removed in the previous release.
+  Resolves: rhbz#1787293
+
 * Fri Dec 13 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.8-1
 - New upstream release.
   Resolves: rhbz#1783205

From 7664e99a9488dd8acb32f9dd1e21b73f327d769d Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 15 Jan 2020 17:12:29 +0900
Subject: [PATCH 56/85] Restore the deprecated API that was accidentally
 removed in the previous release.   Resolves: rhbz#1787293

---
 fribidi-restore-deprecated-api.patch | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 fribidi-restore-deprecated-api.patch

diff --git a/fribidi-restore-deprecated-api.patch b/fribidi-restore-deprecated-api.patch
new file mode 100644
index 0000000..092ed45
--- /dev/null
+++ b/fribidi-restore-deprecated-api.patch
@@ -0,0 +1,38 @@
+From c4d0f2f85b9023b386011b4ca978cf908d8e9a96 Mon Sep 17 00:00:00 2001
+From: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sat, 21 Dec 2019 22:01:43 +0100
+Subject: [PATCH 1/4] Restored mistakenly removed deprecated function
+ fribidi_log2vis_get_embedding_levels()
+
+- Issue #134
+---
+ lib/fribidi-deprecated.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c
+index 7a97292..bc0b8e2 100644
+--- a/lib/fribidi-deprecated.c
++++ b/lib/fribidi-deprecated.c
+@@ -76,6 +76,19 @@ fribidi_reorder_nsm_status (
+ 
+ 
+ 
++FRIBIDI_ENTRY FriBidiLevel
++fribidi_log2vis_get_embedding_levels (
++  const FriBidiCharType *bidi_types,	/* input list of bidi types as returned by
++					   fribidi_get_bidi_types() */
++  const FriBidiStrIndex len,	/* input string length of the paragraph */
++  FriBidiParType *pbase_dir,	/* requested and resolved paragraph
++				 * base direction */
++  FriBidiLevel *embedding_levels	/* output list of embedding levels */
++)
++{
++  return fribidi_get_par_embedding_levels_ex (bidi_types, NULL, len, pbase_dir, embedding_levels);
++}
++
+ FRIBIDI_ENTRY FriBidiCharType
+ fribidi_get_type (
+   FriBidiChar ch		/* input character */
+-- 
+2.24.1
+

From f2aef242bb25757b36543c5ae58c626817687f59 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 19:03:06 +0000
Subject: [PATCH 57/85] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_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 3ad3995..ec36ddd 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,7 +1,7 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
 Version: 1.0.8
-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.bz2
 License: LGPLv2+ and UCD
@@ -85,6 +85,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Jan 15 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.8-2
 - Restore the deprecated API that was accidentally removed in the previous release.
   Resolves: rhbz#1787293

From 29d4c9cf1c60bc1e66b4df17b4667953384364d2 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 5 Mar 2020 18:16:21 +0900
Subject: [PATCH 58/85] New upstream release.   Resolves: rhbz#1809478

---
 .gitignore                           |  1 +
 fribidi-automake.patch               | 12 ---------
 fribidi-restore-deprecated-api.patch | 38 ----------------------------
 fribidi.spec                         | 12 +++++----
 sources                              |  1 +
 5 files changed, 9 insertions(+), 55 deletions(-)
 delete mode 100644 fribidi-automake.patch
 delete mode 100644 fribidi-restore-deprecated-api.patch

diff --git a/.gitignore b/.gitignore
index dd8378c..8c14d10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /fribidi-1.0.6.tar.gz
 /fribidi-1.0.7.tar.bz2
 /fribidi-1.0.8.tar.bz2
+/fribidi-1.0.9.tar.xz
diff --git a/fribidi-automake.patch b/fribidi-automake.patch
deleted file mode 100644
index a634e29..0000000
--- a/fribidi-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pruN fribidi-1.0.6.orig/gen.tab/Makefile.am fribidi-1.0.6/gen.tab/Makefile.am
---- fribidi-1.0.6.orig/gen.tab/Makefile.am	2019-09-27 14:03:47.000000000 +0900
-+++ fribidi-1.0.6/gen.tab/Makefile.am	2019-09-27 17:42:00.196295996 +0900
-@@ -25,7 +25,7 @@ gen_brackets_type_tab_CPPFLAGS = $(AM_CP
- 
- CFLAGS_FOR_BUILD += -DHAVE_CONFIG_H -I$(top_builddir) -I$(top_builddir)/lib -I$(top_srcdir)/lib
- CC = $(CC_FOR_BUILD)
--CFLAGS = $(CFLAGS_FOR_BUILD)
-+AM_CFLAGS = $(CFLAGS_FOR_BUILD)
- 
- CLEANFILES = $(EXTRA_PROGRAMS)
- DISTCLEANFILES =
diff --git a/fribidi-restore-deprecated-api.patch b/fribidi-restore-deprecated-api.patch
deleted file mode 100644
index 092ed45..0000000
--- a/fribidi-restore-deprecated-api.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c4d0f2f85b9023b386011b4ca978cf908d8e9a96 Mon Sep 17 00:00:00 2001
-From: Dov Grobgeld <dov.grobgeld@gmail.com>
-Date: Sat, 21 Dec 2019 22:01:43 +0100
-Subject: [PATCH 1/4] Restored mistakenly removed deprecated function
- fribidi_log2vis_get_embedding_levels()
-
-- Issue #134
----
- lib/fribidi-deprecated.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c
-index 7a97292..bc0b8e2 100644
---- a/lib/fribidi-deprecated.c
-+++ b/lib/fribidi-deprecated.c
-@@ -76,6 +76,19 @@ fribidi_reorder_nsm_status (
- 
- 
- 
-+FRIBIDI_ENTRY FriBidiLevel
-+fribidi_log2vis_get_embedding_levels (
-+  const FriBidiCharType *bidi_types,	/* input list of bidi types as returned by
-+					   fribidi_get_bidi_types() */
-+  const FriBidiStrIndex len,	/* input string length of the paragraph */
-+  FriBidiParType *pbase_dir,	/* requested and resolved paragraph
-+				 * base direction */
-+  FriBidiLevel *embedding_levels	/* output list of embedding levels */
-+)
-+{
-+  return fribidi_get_par_embedding_levels_ex (bidi_types, NULL, len, pbase_dir, embedding_levels);
-+}
-+
- FRIBIDI_ENTRY FriBidiCharType
- fribidi_get_type (
-   FriBidiChar ch		/* input character */
--- 
-2.24.1
-
diff --git a/fribidi.spec b/fribidi.spec
index ec36ddd..8557f1e 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -1,9 +1,9 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.8
-Release: 3%{?dist}
+Version: 1.0.9
+Release: 1%{?dist}
 URL: https://github.com/fribidi/fribidi/
-Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 License: LGPLv2+ and UCD
 BuildRequires: gcc
 %if 0%{?rhel} && 0%{?rhel} <= 8
@@ -12,8 +12,6 @@ BuildRequires: automake autoconf libtool
 BuildRequires: meson
 %endif
 Patch0: %{name}-drop-bundled-gnulib.patch
-Patch1: %{name}-automake.patch
-Patch2: %{name}-restore-deprecated-api.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -85,6 +83,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 #%%{_mandir}/man3/*.gz
 
 %changelog
+* Thu Mar 05 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.9-1
+- New upstream release.
+  Resolves: rhbz#1809478
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 96e8d08..5ec9c97 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (fribidi-1.0.8.tar.bz2) = d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
+SHA512 (fribidi-1.0.9.tar.xz) = e66989830941172fa003c8b9376719282fa1039592a1e158e975cab81ce8dcb2755453c64906a8464c047f9e9154e012d9bd37256b1f463e235648a13e4601ed

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 59/85] 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 60/85] 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 61/85] 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 62/85] - 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 63/85] 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 64/85] - 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 65/85] - 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 66/85] 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 67/85] 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 68/85] - 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 69/85] 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 70/85] 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 71/85] 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 72/85] 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 73/85] 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 74/85] 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 75/85] 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 76/85] 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 77/85] 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 78/85] 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 79/85] 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 80/85] 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 81/85] 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 82/85] 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 83/85] 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 84/85] 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 85/85] 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