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

diff --git a/fontconfig.spec b/fontconfig.spec
index fe08b1d..079ddf0 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -8,17 +8,18 @@ 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.14.0
-Release:	2
+Version:	2.15.0
+Release:	1
 Epoch:		1
 License:	MIT
 Group:		Libraries
 Source0:	https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.xz
-# Source0-md5:	e12700a9d522bdfec06b6b7e72646987
+# 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}
@@ -67,7 +68,7 @@ Summary(pt_BR.UTF-8):	Biblioteca para configuração e customização do acesso
 Group:		Libraries
 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
@@ -92,7 +93,7 @@ Requires:	expat-devel
 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
@@ -122,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.
@@ -136,6 +137,7 @@ 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
@@ -200,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