X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffontconfig.git;a=blobdiff_plain;f=fontconfig.spec;h=38092229d2726fb7759ee7a9eed46590c4c3f65e;hp=22a582313535422821bd17ab294208b6a5df8ca6;hb=HEAD;hpb=f14aacd59454b980496245e3b80d72a228ec2380

diff --git a/fontconfig.spec b/fontconfig.spec
index 22a5823..079ddf0 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -8,18 +8,20 @@ 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.1
+Version:	2.15.0
 Release:	1
 Epoch:		1
 License:	MIT
 Group:		Libraries
-Source0:	https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.bz2
-# Source0-md5:	36cdea1058ef13cbbfdabe6cb019dc1c
+Source0:	https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.xz
+# Source0-md5:	5bb3a2829aecb22ae553c39099bd0d6a
 Source1:	%{name}-lcd-filter.conf
 Patch0:		%{name}-bitstream-cyberbit.patch
+Patch1:		disable-tests.patch
 URL:		http://fontconfig.org/
-BuildRequires:	autoconf >= 2.61
+BuildRequires:	autoconf >= 2.71
 BuildRequires:	automake >= 1:1.11
+%{?with_tests:BuildRequires:	bubblewrap}
 %if %{with doc}
 BuildRequires:	docbook-dtd31-sgml
 BuildRequires:	docbook-dtd41-sgml
@@ -28,13 +30,16 @@ BuildRequires:	docbook-utils >= 0.6.13-3
 BuildRequires:	ed
 BuildRequires:	expat-devel
 # pkgconfig(freetype) >= 21.0.15
-BuildRequires:	freetype-devel >= 1:2.8.1
+BuildRequires:	freetype-devel >= 1:2.9
 BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	gperf
 %{?with_tests:BuildRequires:	json-c-devel}
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libuuid-devel
 BuildRequires:	pkgconfig
+%{?with_doc:BuildRequires:	python3}
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,9 +66,9 @@ 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 >= 1:2.8.1
+Requires:	freetype >= 1:2.9
 Provides:	XFree86-fontconfig
-Obsoletes:	XFree86-fontconfig
+Obsoletes:	XFree86-fontconfig < 4.4
 Conflicts:	fontconfig <= 1:2.2.98-1
 
 %description libs
@@ -85,10 +90,10 @@ 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 >= 1:2.8.1
+Requires:	freetype-devel >= 1:2.9
 Requires:	libuuid-devel
 Provides:	XFree86-fontconfig-devel
-Obsoletes:	XFree86-fontconfig-devel
+Obsoletes:	XFree86-fontconfig-devel < 4.4
 
 %description devel
 Fontconfig is designed to locate fonts within the system and select
@@ -118,7 +123,7 @@ Summary(pt_BR.UTF-8):	Biblioteca estática para configuração e customização
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 Provides:	XFree86-fontconfig-static
-Obsoletes:	XFree86-fontconfig-static
+Obsoletes:	XFree86-fontconfig-static < 4.4
 
 %description static
 This package contains static version of fontconfig library.
@@ -132,6 +137,10 @@ 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}
@@ -193,7 +202,7 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README README.confd doc/fontconfig-user.html
+%doc AUTHORS COPYING ChangeLog NEWS README.md README.confd doc/fontconfig-user.html
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf
 %{_sysconfdir}/fonts/conf.avail
 %{_sysconfdir}/fonts/conf.d/README