From e06760b611c692719d693167613308597d0ad8f6 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Fri, 10 Jan 2020 16:22:22 +0300 Subject: [PATCH] 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 - 0.7.0-3 +* Fri Jan 10 2020 Mosaab Alzoubi - 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 - 0.7.0-1