diff --git a/.gitignore b/.gitignore index 6916a0b..4cda18a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /raqm-0.1.1.tar.gz /raqm-0.5.0.tar.gz /raqm-0.7.0.tar.gz +/raqm-0.7.2.tar.xz diff --git a/0001-Pass-version-to-meson-library.patch b/0001-Pass-version-to-meson-library.patch new file mode 100644 index 0000000..83d23ef --- /dev/null +++ b/0001-Pass-version-to-meson-library.patch @@ -0,0 +1,25 @@ +From 819a3e9cdda55aaeb062830cc91afeb6584f410a Mon Sep 17 00:00:00 2001 +From: Khaled Hosny +Date: Tue, 28 Sep 2021 16:10:16 +0200 +Subject: [PATCH] Pass version to meson library + +Fixes https://github.com/HOST-Oman/libraqm/issues/136 +--- + src/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meson.build b/src/meson.build +index 40554b2..16ec18c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -42,6 +42,7 @@ libraqm = library( + 'raqm', + 'raqm.c', + 'raqm.h', ++ version : meson.project_version(), + dependencies : deps, + c_args : ['-DHAVE_CONFIG_H'], + install : true, +-- +2.32.0 + diff --git a/libraqm.spec b/libraqm.spec index 7f650b1..8ee2ce2 100644 --- a/libraqm.spec +++ b/libraqm.spec @@ -1,19 +1,16 @@ Name: libraqm -Version: 0.7.0 -Release: 4%{?dist} +Version: 0.7.2 +Release: 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 +Source: %{url}/releases/download/v%{version}/raqm-%{version}.tar.xz +# Backports from upstream +Patch0001: 0001-Pass-version-to-meson-library.patch -%if 0%{?el7} -BuildRequires: python2 -%else -BuildRequires: python3 -%endif - -BuildRequires: gcc +BuildRequires: meson +BuildRequires: gcc BuildRequires: freetype-devel BuildRequires: harfbuzz-devel BuildRequires: fribidi-devel @@ -53,14 +50,11 @@ This package contains documentation files for raqm. وثائق مكتبة رقم. %prep -%setup -q -n raqm-%{version} -%if ! 0%{?el7} -sed s:python:%{__python3}:g -i tests/Makefile.in #Fixed in next release on upstream -%endif -%configure --enable-gtk-doc +%autosetup -p1 -n raqm-%{version} %build -make %{?_smp_mflags} +%meson -Ddocs=true +%meson_build %check %if 0%{?el7} @@ -68,13 +62,13 @@ export LC_ALL=en_US.UTF-8 %else export LC_ALL=C.utf8 %endif -make check +%meson_test %install -%make_install +%meson_install rm -f %{buildroot}%{_libdir}/*.{la,a} -%ldconfig_scriptlets devel +%ldconfig_scriptlets %files %license COPYING @@ -93,6 +87,25 @@ rm -f %{buildroot}%{_libdir}/*.{la,a} %{_datadir}/gtk-doc/html/raqm %changelog +* Sun Oct 03 2021 Neal Gompa - 0.7.2-1 +- Update to 0.7.2 +- Minor cleanups to the spec + +* Sat Oct 02 2021 Kalev Lember - 0.7.0-9 +- Backport upstream patch to fix failing self tests (#1987659) + +* Thu Jul 22 2021 Fedora Release Engineering - 0.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.7.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 10 2020 Mosaab Alzoubi - 0.7.0-4 - First build on EPEL8 - Use one branch to build on Fedora and EPEL diff --git a/sources b/sources index 0964c96..4bbf313 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (raqm-0.7.0.tar.gz) = 4aed401df0b53cc95423afa5980164b54102776eca675119fc483c410334a635ca95ef6564ee9b54666c13c916eb52a0a1cd24f288230946c53825fb10451161 +SHA512 (raqm-0.7.2.tar.xz) = 26321397c1020a16829e24b7f122c3a757a179ebddf5a3143d95cc780573a92e4d722fc94ce5ab8c35f3946b8935178c2e917de5afb17d407d45552765603c47