- rel 3; disable tests using bwrap

[packages/fontconfig.git] / fontconfig.spec

diff --git a/fontconfig.spec b/fontconfig.spec
index 2affe476cb6e07a094b054d4d87b142094c8688b..9247f6cd614f429cf36f538db356fa4e2ede4c82 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -8,16 +8,15 @@ Summary:      Font configuration and customization tools
 Summary(pl.UTF-8):     Narzędzia do konfigurowania fontów
 Summary(pt_BR.UTF-8):  Ferramentas para configuração e customização do acesso a fontes
 Name:          fontconfig
-Version:       2.13.0
-Release:       2
+Version:       2.13.1
+Release:       3
 Epoch:         1
 License:       MIT
 Group:         Libraries
 Source0:       https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.bz2
-# Source0-md5: 60d2394a79d3b2e5db2daea55193fa47
+# Source0-md5: 36cdea1058ef13cbbfdabe6cb019dc1c
 Source1:       %{name}-lcd-filter.conf
 Patch0:                %{name}-bitstream-cyberbit.patch
-Patch1:                %{name}-constant-weight.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.11
@@ -28,13 +27,15 @@ BuildRequires:      docbook-utils >= 0.6.13-3
 %endif
 BuildRequires: ed
 BuildRequires: expat-devel
-BuildRequires: freetype-devel >= 2.8.1
+# pkgconfig(freetype) >= 21.0.15
+BuildRequires: freetype-devel >= 1:2.8.1
 BuildRequires: gettext-tools >= 0.19.8
 BuildRequires: gperf
+%{?with_tests:BuildRequires:   json-c-devel}
 BuildRequires: libtool >= 2:2.2
+BuildRequires: libuuid-devel
 BuildRequires: pkgconfig
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      freetype >= 2.8.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -60,7 +61,7 @@ Summary:      Font configuration and customization library
 Summary(pl.UTF-8):     Biblioteka do konfigurowania fontów
 Summary(pt_BR.UTF-8):  Biblioteca para configuração e customização do acesso a fontes
 Group:         Libraries
-Requires:      freetype >= 2.1.5
+Requires:      freetype >= 1:2.8.1
 Provides:      XFree86-fontconfig
 Obsoletes:     XFree86-fontconfig
 Conflicts:     fontconfig <= 1:2.2.98-1
@@ -84,7 +85,8 @@ Summary(pt_BR.UTF-8): Biblioteca para configuração e customização do acesso
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      expat-devel
-Requires:      freetype-devel >= 2.1.5
+Requires:      freetype-devel >= 1:2.8.1
+Requires:      libuuid-devel
 Provides:      XFree86-fontconfig-devel
 Obsoletes:     XFree86-fontconfig-devel
 
@@ -130,7 +132,9 @@ Este pacote contém a biblioteca estática do fontconfig
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
+# bwrap: No permissions to creating new namespace, likely because the kernel does not allow non-privileged user namespaces...
+sed -i -e 's#BWRAP=.*#BWRAP=#g' test/run-test.sh
 
 %build
 %{__gettextize}
@@ -149,7 +153,7 @@ export HASDOCBOOK=no
        --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static
 %{__make}
 
-%{?with_tests:%{__make} check || cat test/test-suite.log}
+%{?with_tests:%{__make} OSTYPE=linux check || (cat test/test-suite.log && /bin/false)}
 
 %install
 rm -rf $RPM_BUILD_ROOT