From 6dc9624b3b76f7f81f1e8be4aca56a5f54e87723 Mon Sep 17 00:00:00 2001
From: Mosaab Alzoubi <moceap@hotmail.com>
Date: Fri, 10 Jan 2020 15:31:08 +0300
Subject: [PATCH 1/3] Unite branches in one spec, Built in EPEL8

---
 libraqm.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/libraqm.spec b/libraqm.spec
index 5254232..d617028 100644
--- a/libraqm.spec
+++ b/libraqm.spec
@@ -1,13 +1,13 @@
 Name:				libraqm
 Version:			0.7.0
-Release:			1%{?dist}
+Release:			3%{?dist}
 License:			MIT
 Summary:			Complex Textlayout Library
 Summary(ar):		مكتبة رقم للنّصوص المركّبة
 URL:				https://github.com/HOST-Oman/libraqm
 Source:				https://github.com/HOST-Oman/libraqm/releases/download/v%{version}/raqm-%{version}.tar.gz
 
-BuildRequires:      python
+BuildRequires:      python3
 BuildRequires:      gcc
 BuildRequires:		freetype-devel
 BuildRequires:		harfbuzz-devel
@@ -49,13 +49,18 @@ This package contains documentation files for raqm.
 
 %prep
 %setup -q -n raqm-%{version}
+sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream 
 %configure --enable-gtk-doc
 
 %build
 make %{?_smp_mflags}
 
 %check
+%if 0%{?el7}
+export LC_ALL=en_US.UTF-8
+%else
 export LC_ALL=C.utf8
+%endif
 make check
 
 %install
@@ -81,6 +86,12 @@ rm -f %{buildroot}%{_libdir}/*.{la,a}
 %{_datadir}/gtk-doc/html/raqm
 
 %changelog
+* Fri Jan 10 2020 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-3
+- First build on EPEL8
+- Use one branch to build on Fedora and EPEL
+- Use python3 as BR
+- Use LC_ALL=en_US.UTF-8 in EPEL7
+
 * Sun Sep 8 2019 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-1
 - Updated to 0.7.0
 

From e06760b611c692719d693167613308597d0ad8f6 Mon Sep 17 00:00:00 2001
From: Mosaab Alzoubi <moceap@hotmail.com>
Date: Fri, 10 Jan 2020 16:22:22 +0300
Subject: [PATCH 2/3] Unite Branches #3

---
 libraqm.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraqm.spec b/libraqm.spec
index d617028..d7ba288 100644
--- a/libraqm.spec
+++ b/libraqm.spec
@@ -1,13 +1,18 @@
 Name:				libraqm
 Version:			0.7.0
-Release:			3%{?dist}
+Release:			3.1%{?dist}
 License:			MIT
 Summary:			Complex Textlayout Library
 Summary(ar):		مكتبة رقم للنّصوص المركّبة
 URL:				https://github.com/HOST-Oman/libraqm
 Source:				https://github.com/HOST-Oman/libraqm/releases/download/v%{version}/raqm-%{version}.tar.gz
 
+%if 0%{?el7}
+BuildRequires:      python2
+%else
 BuildRequires:      python3
+%endif
+
 BuildRequires:      gcc
 BuildRequires:		freetype-devel
 BuildRequires:		harfbuzz-devel
@@ -49,7 +54,9 @@ This package contains documentation files for raqm.
 
 %prep
 %setup -q -n raqm-%{version}
-sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream 
+%if %{?el7}
+sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream
+%endif
 %configure --enable-gtk-doc
 
 %build
@@ -86,10 +93,10 @@ rm -f %{buildroot}%{_libdir}/*.{la,a}
 %{_datadir}/gtk-doc/html/raqm
 
 %changelog
-* Fri Jan 10 2020 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-3
+* Fri Jan 10 2020 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-3.1
 - First build on EPEL8
 - Use one branch to build on Fedora and EPEL
-- Use python3 as BR
+- Use python3 as BR except EPEL7
 - Use LC_ALL=en_US.UTF-8 in EPEL7
 
 * Sun Sep 8 2019 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-1

From c5603f92a13004b46cba5c5d53a93fe7e4b98b4d Mon Sep 17 00:00:00 2001
From: Mosaab Alzoubi <moceap@hotmail.com>
Date: Sat, 11 Jan 2020 01:23:48 +0300
Subject: [PATCH 3/3] Uniting #Final

---
 libraqm.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraqm.spec b/libraqm.spec
index d7ba288..7f650b1 100644
--- a/libraqm.spec
+++ b/libraqm.spec
@@ -1,6 +1,6 @@
 Name:				libraqm
 Version:			0.7.0
-Release:			3.1%{?dist}
+Release:			4%{?dist}
 License:			MIT
 Summary:			Complex Textlayout Library
 Summary(ar):		مكتبة رقم للنّصوص المركّبة
@@ -54,7 +54,7 @@ This package contains documentation files for raqm.
 
 %prep
 %setup -q -n raqm-%{version}
-%if %{?el7}
+%if ! 0%{?el7}
 sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream
 %endif
 %configure --enable-gtk-doc
@@ -93,7 +93,7 @@ rm -f %{buildroot}%{_libdir}/*.{la,a}
 %{_datadir}/gtk-doc/html/raqm
 
 %changelog
-* Fri Jan 10 2020 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-3.1
+* Fri Jan 10 2020 Mosaab Alzoubi <moceap@hotmail.com> - 0.7.0-4
 - First build on EPEL8
 - Use one branch to build on Fedora and EPEL
 - Use python3 as BR except EPEL7