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

diff --git a/fontconfig.spec b/fontconfig.spec
index 4705c9d..079ddf0 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,31 +1,46 @@
 #
 # Conditional build
-%bcond_with	bytecode	# use bytecode hinting instead of autohinting by default
-#
+%bcond_without	static_libs	# don't build static library
+%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):	Narzêdzia do konfigurowania fontów
-Summary(pt_BR):	Ferramentas para configuração e customização do acesso a fontes
+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.3.1
+Version:	2.15.0
 Release:	1
 Epoch:		1
 License:	MIT
 Group:		Libraries
-Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	d5e42a27ad2f22bc5ec45f15533fc5d1
-Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-autohint.patch
+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
-BuildRequires:	automake
-BuildRequires:	docbook-utils >= 0.6.13-3
+BuildRequires:	autoconf >= 2.71
+BuildRequires:	automake >= 1:1.11
+%{?with_tests:BuildRequires:	bubblewrap}
+%if %{with doc}
+BuildRequires:	docbook-dtd31-sgml
 BuildRequires:	docbook-dtd41-sgml
+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
@@ -34,50 +49,51 @@ them according to requirements specified by applications.
 
 This package contains tools and documentation.
 
-%description -l pl
-Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
+%description -l pl.UTF-8
+Fontconfig jest biblioteką przeznaczoną do lokalizowania fontów w
+systemie i wybierania ich w zależności od potrzeb aplikacji.
 
-Paket ten zawiera programy narzêdziowe i dokumentacjê.
+Paket ten zawiera programy narzędziowe i dokumentację.
 
-%description -l pt_BR
-Fontconfig é uma biblioteca para configuração e customização do acesso
+%description -l pt_BR.UTF-8
+Fontconfig é uma biblioteca para configuração e customização do acesso
 a fontes.
 
-Este pacote contém as ferramentas e documentação.
+Este pacote contém as ferramentas e documentação.
 
 %package libs
 Summary:	Font configuration and customization library
-Summary(pl):	Biblioteka do konfigurowania fontów
-Summary(pt_BR):	Biblioteca para configuração e customização do acesso a fontes
-Group:		Development/Libraries
-Requires:	freetype >= 2.1.5
+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.9
 Provides:	XFree86-fontconfig
+Obsoletes:	XFree86-fontconfig < 4.4
 Conflicts:	fontconfig <= 1:2.2.98-1
-Obsoletes:	XFree86-fontconfig
 
 %description libs
 Fontconfig is designed to locate fonts within the system and select
 them according to requirements specified by applications.
 
-%description libs -l pl
-Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
+%description libs -l pl.UTF-8
+Fontconfig jest biblioteką przeznaczoną do lokalizowania fontów w
+systemie i wybierania ich w zależności od potrzeb aplikacji.
 
-%description libs -l pt_BR
-Fontconfig é uma biblioteca para configuração e customização do acesso
+%description libs -l pt_BR.UTF-8
+Fontconfig é uma biblioteca para configuração e customização do acesso
 a fontes.
 
 %package devel
 Summary:	Font configuration and customization library - development files
-Summary(pl):	Biblioteka do konfigurowania fontów - pliki dla programistów
-Summary(pt_BR):	Biblioteca para configuração e customização do acesso a fontes - arquivos de desenvolvimento
+Summary(pl.UTF-8):	Biblioteka do konfigurowania fontów - pliki dla programistów
+Summary(pt_BR.UTF-8):	Biblioteca para configuração e customização do acesso a fontes - arquivos de desenvolvimento
 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
@@ -86,102 +102,149 @@ them according to requirements specified by applications.
 This package contains the header files needed to develop programs that
 use these fontconfig.
 
-%description devel -l pl
-Fontconfig jest bibliotek± przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
+%description devel -l pl.UTF-8
+Fontconfig jest biblioteką przeznaczoną do lokalizowania fontów w
+systemie i wybierania ich w zależności od potrzeb aplikacji.
 
-Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania
-programów korzystaj±cych z biblioteki fontconfig.
+Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilowania
+programów korzystających z biblioteki fontconfig.
 
-%description devel -l pt_BR
-Fontconfig é uma biblioteca para configuração e customização do acesso
+%description devel -l pt_BR.UTF-8
+Fontconfig é uma biblioteca para configuração e customização do acesso
 a fontes.
 
-Este pacote contém arquivos de desenvolvimento necessários à criação
-de extensões baseadas na biblioteca fontconfig.
+Este pacote contém arquivos de desenvolvimento necessários à criação
+de extensões baseadas na biblioteca fontconfig.
 
 %package static
 Summary:	Static font configuration and customization library
-Summary(pl):	Statyczna biblioteka do konfigurowania fontów
-Summary(pt_BR):	Biblioteca estática para configuração e customização do acesso a fontes
+Summary(pl.UTF-8):	Statyczna biblioteka do konfigurowania fontów
+Summary(pt_BR.UTF-8):	Biblioteca estática para configuração e customização do acesso a fontes
 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.
 
-%description static -l pl
-Ten pakiet zawiera statyczn± wersjê biblioteki fontconfig.
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczną wersję biblioteki fontconfig.
 
-%description static -l pt_BR
-Este pacote contém a biblioteca estática do fontconfig
+%description static -l pt_BR.UTF-8
+Este pacote contém a biblioteca estática do fontconfig
 
 %prep
 %setup -q
 %patch0 -p1
-%if %{with bytecode}
 %patch1 -p1
-%endif
+
+# 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}
+
+# don't rebuild docs by default, use prebuild ones
+export HASDOCBOOK=no
+
 %configure \
-	--disable-docs
+	--enable-docs%{!?with_doc:=no} \
+	--disable-silent-rules \
+	--%{?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}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig} \
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	htmldoc_DATA= \
+	doc_DATA=
+
+install %{SOURCE1} \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/conf.avail/10-lcd-filter.conf
 
-install doc/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+ln -s %{_datadir}/%{name}/conf.avail $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
 
-cp -f conf.d/README README.confd
+cp -pf conf.d/README README.confd
+
+%find_lang %{name}
+%find_lang %{name}-conf -a %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pretrans
+# this needs to be a symlink
+if [ -d %{_sysconfdir}/fonts/conf.avail ] && [ ! -L %{_sysconfdir}/fonts/conf.avail ]; then
+	mv -f %{_sysconfdir}/fonts/conf.avail{,.rpmsave}
+	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
 umask 022
-HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null
+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
-%attr(755,root,root) %{_bindir}/fc-*
-%{_mandir}/man1/*.1*
-%{_mandir}/man5/*.5*
+%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
+%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*
+%endif
+%dir /var/cache/fontconfig
 
 %files libs
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/fonts
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf
-%{_sysconfdir}/fonts/fonts.dtd
-%dir %{_sysconfdir}/fonts/conf.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/conf.d/*.conf
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libfontconfig.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfontconfig.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/fontconfig-devel/*.html
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libfontconfig.so
+%{_libdir}/libfontconfig.la
 %{_includedir}/fontconfig
 %{_pkgconfigdir}/fontconfig.pc
-%{_mandir}/man3/*.3*
+%{_datadir}/gettext/its/fontconfig.its
+%{_datadir}/gettext/its/fontconfig.loc
+%if %{with doc}
+%{_mandir}/man3/Fc*.3*
+%endif
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libfontconfig.a
+%endif