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

diff --git a/fontconfig.spec b/fontconfig.spec
index 0e20002..079ddf0 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,30 +1,27 @@
-# TODO:
-# - upgrade puts new files into /usr/share/fontconfig/conf.avail/*.conf
-# and also removes /etc/fonts/conf.avail/*.conf BUT there is a symlink
-# /etc/fonts/conf.avail/ -> /usr/share/fontconfig/conf.avail/ and in the end
-# rpm deletes freshly installed /usr/share/fontconfig/conf.avail/*.conf files
-
+#
 # Conditional build
 %bcond_without	static_libs	# don't build static library
-%bcond_without	doc
-#
+%bcond_without	doc		# don't build HTML and man docs
+%bcond_without	tests		# don't perform make check
+
 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.10.1
-Release:	0.1
+Version:	2.15.0
+Release:	1
 Epoch:		1
 License:	MIT
 Group:		Libraries
-Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	c94e380eea42f2f23ca9537035ef1899
+Source0:	https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.xz
+# Source0-md5:	5bb3a2829aecb22ae553c39099bd0d6a
 Source1:	%{name}-lcd-filter.conf
-Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-bitstream-cyberbit.patch
+Patch0:		%{name}-bitstream-cyberbit.patch
+Patch1:		disable-tests.patch
 URL:		http://fontconfig.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.71
+BuildRequires:	automake >= 1:1.11
+%{?with_tests:BuildRequires:	bubblewrap}
 %if %{with doc}
 BuildRequires:	docbook-dtd31-sgml
 BuildRequires:	docbook-dtd41-sgml
@@ -32,11 +29,18 @@ BuildRequires:	docbook-utils >= 0.6.13-3
 %endif
 BuildRequires:	ed
 BuildRequires:	expat-devel
-BuildRequires:	freetype-devel >= 2.1.5
-BuildRequires:	libtool
+# pkgconfig(freetype) >= 21.0.15
+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}
-Requires:	freetype >= 2.1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,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 >= 2.1.5
+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
@@ -86,9 +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 >= 2.1.5
+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.
@@ -134,9 +139,13 @@ Este pacote contém a biblioteca estática do fontconfig
 %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}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -145,11 +154,13 @@ Este pacote contém a biblioteca estática do fontconfig
 export HASDOCBOOK=no
 
 %configure \
-	--%{?with_doc:en}%{!?with_doc:dis}able-docs \
+	--enable-docs%{!?with_doc:=no} \
 	--disable-silent-rules \
-	%{!?with_static_libs:--disable-static}
+	--%{?with_static_libs:en}%{!?with_static_libs:dis}able-static
 %{__make}
 
+%{?with_tests:%{__make} OSTYPE=linux check || (cat test/test-suite.log && /bin/false)}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig} \
@@ -166,6 +177,9 @@ ln -s %{_datadir}/%{name}/conf.avail $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.av
 
 cp -pf conf.d/README README.confd
 
+%find_lang %{name}
+%find_lang %{name}-conf -a %{name}.lang
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -176,6 +190,7 @@ if [ -d %{_sysconfdir}/fonts/conf.avail ] && [ ! -L %{_sysconfdir}/fonts/conf.av
 	install -d %{_datadir}/%{name}/conf.avail
 	ln -s %{_datadir}/%{name}/conf.avail %{_sysconfdir}/fonts/conf.avail
 	mv -f %{_sysconfdir}/fonts/conf.avail.rpmsave/*.conf %{_sysconfdir}/fonts/conf.avail/
+	rmdir %{_sysconfdir}/fonts/conf.avail.rpmsave 2>/dev/null || :
 fi
 
 %post
@@ -185,26 +200,25 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README README.confd doc/fontconfig-user.html
-%dir %{_sysconfdir}/fonts
+%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
-%dir %{_datadir}/xml/%{name}
-%{_datadir}/xml/%{name}/fonts.dtd
-%dir %{_datadir}/%{name}/conf.avail
-%{_datadir}/%{name}/conf.avail/*.conf
-%dir %{_sysconfdir}/fonts/conf.d
 %{_sysconfdir}/fonts/conf.d/README
 %config(noreplace,missingok) %verify(not link md5 mtime size) %{_sysconfdir}/fonts/conf.d/*.conf
 %attr(755,root,root) %{_bindir}/fc-cache
 %attr(755,root,root) %{_bindir}/fc-cat
+%attr(755,root,root) %{_bindir}/fc-conflist
 %attr(755,root,root) %{_bindir}/fc-list
 %attr(755,root,root) %{_bindir}/fc-match
 %attr(755,root,root) %{_bindir}/fc-query
 %attr(755,root,root) %{_bindir}/fc-pattern
 %attr(755,root,root) %{_bindir}/fc-scan
+%attr(755,root,root) %{_bindir}/fc-validate
+%dir %{_datadir}/xml/%{name}
+%{_datadir}/xml/%{name}/fonts.dtd
+%{_datadir}/%{name}/conf.avail/*.conf
 %if %{with doc}
 %{_mandir}/man1/fc-*.1*
 %{_mandir}/man5/fonts-conf.5*
@@ -223,6 +237,8 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %{_libdir}/libfontconfig.la
 %{_includedir}/fontconfig
 %{_pkgconfigdir}/fontconfig.pc
+%{_datadir}/gettext/its/fontconfig.its
+%{_datadir}/gettext/its/fontconfig.loc
 %if %{with doc}
 %{_mandir}/man3/Fc*.3*
 %endif