X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fontconfig.spec;h=2dd35ad90ed728b90d48f280d42b581413fd4e00;hb=3ea8a859aeff0dc6f78d475066d50f1fbc9b2816;hp=5b50f89a1283b8fd17ed785a3639e8268f853d51;hpb=7121d4efdcd106680f241862e577c1116807da08;p=packages%2Ffontconfig.git

diff --git a/fontconfig.spec b/fontconfig.spec
index 5b50f89..2dd35ad 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,26 +1,30 @@
 #
 # Conditional build
 %bcond_without	static_libs	# don't build static library
-#
+%bcond_without	doc
+
 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.7.3
-Release:	1
+Version:	2.10.93
+Release:	3
 Epoch:		1
 License:	MIT
 Group:		Libraries
-Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	747d2c691c66b563c8e8c1784ce8d014
+Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.bz2
+# Source0-md5:	0f8e5c63c2d6931626185c02802375a3
 Source1:	%{name}-lcd-filter.conf
-Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-bitstream-cyberbit.patch
+Patch0:		%{name}-bitstream-cyberbit.patch
+Patch1:		%{name}-git.patch
 URL:		http://fontconfig.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.11
+%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
@@ -52,7 +56,7 @@ Este pacote contém as ferramentas e documentação.
 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:		Development/Libraries
+Group:		Libraries
 Requires:	freetype >= 2.1.5
 Provides:	XFree86-fontconfig
 Obsoletes:	XFree86-fontconfig
@@ -127,31 +131,49 @@ Este pacote contém a biblioteca estática do fontconfig
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
+# don't rebuild docs by default, use prebuild ones
+export HASDOCBOOK=no
+
 %configure \
-	--enable-docs \
+	--%{?with_doc:en}%{!?with_doc:dis}able-docs \
+	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig} \
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	htmldoc_DATA= \
 	doc_DATA=
+
 install %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/10-lcd-filter.conf
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/conf.avail/10-lcd-filter.conf
+
+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
 
 %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 || :
@@ -161,12 +183,15 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README README.confd
+%doc AUTHORS COPYING ChangeLog README README.confd doc/fontconfig-user.html
 %dir %{_sysconfdir}/fonts
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf
-%{_sysconfdir}/fonts/fonts.dtd
-%dir %{_sysconfdir}/fonts/conf.avail
-%{_sysconfdir}/fonts/conf.avail/*.conf
+%{_sysconfdir}/fonts/conf.avail
+%dir %{_datadir}/xml/%{name}
+%{_datadir}/xml/%{name}/fonts.dtd
+%dir %{_datadir}/%{name}
+%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
@@ -175,10 +200,14 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %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
+%if %{with doc}
 %{_mandir}/man1/fc-*.1*
 %{_mandir}/man5/fonts-conf.5*
-/var/cache/fontconfig
+%endif
+%dir /var/cache/fontconfig
 
 %files libs
 %defattr(644,root,root,755)
@@ -192,7 +221,9 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %{_libdir}/libfontconfig.la
 %{_includedir}/fontconfig
 %{_pkgconfigdir}/fontconfig.pc
+%if %{with doc}
 %{_mandir}/man3/Fc*.3*
+%endif
 
 %if %{with static_libs}
 %files static