- rel 3; fixes from git

[packages/fontconfig.git] / fontconfig.spec

diff --git a/fontconfig.spec b/fontconfig.spec
index bee9abac5330d6bbf076e72ca3399d73f44ca591..2dd35ad90ed728b90d48f280d42b581413fd4e00 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,24 +1,25 @@
+#
 # 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.10.1
-Release:       2
+Version:       2.10.93
+Release:       3
 Epoch:         1
 License:       MIT
 Group:         Libraries
-Source0:       http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: c94e380eea42f2f23ca9537035ef1899
+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
@@ -130,7 +131,7 @@ Este pacote contém a biblioteca estática do fontconfig
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -170,6 +171,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
@@ -200,6 +202,7 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %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*