- added -cmap-parsing.patch from FC (speed up cache generation)

[packages/fontconfig.git] / fontconfig.spec

diff --git a/fontconfig.spec b/fontconfig.spec
index 83969162bf634c82c731545679664f3040e3cb91..d572a260eb8587c3661ae01254658e87c56d7963 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,20 +1,22 @@
 #
 # Conditional build
 %bcond_with    bytecode        # use bytecode hinting instead of autohinting by default
+%bcond_without static_libs     # don't build static library
 #
 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
 Name:          fontconfig
-Version:       2.3.2
-Release:       1
+Version:       2.3.95
+Release:       2
 Epoch:         1
 License:       MIT
 Group:         Libraries
 Source0:       http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: 7354f9f125ea78a8f2851cb9c31d4866
+# Source0-md5: 6860be35882f6d34636d52345efd5944
 Patch0:                %{name}-blacklist.patch
 Patch1:                %{name}-autohint.patch
+Patch2:                %{name}-cmap-parsing.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -24,6 +26,7 @@ BuildRequires:        ed
 BuildRequires: expat-devel
 BuildRequires: freetype-devel >= 2.1.5
 BuildRequires: libtool
+BuildRequires: pkgconfig
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      freetype >= 2.1.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -124,6 +127,7 @@ Este pacote cont
 %if %{with bytecode}
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -132,12 +136,13 @@ Este pacote cont
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-docs
+       --disable-docs \
+       %{!?with_static_libs:--disable-static}
 %{__make}
 
 %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
@@ -152,7 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -163,6 +168,7 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null
 %attr(755,root,root) %{_bindir}/fc-*
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
+/var/cache/fontconfig
 
 %files libs
 %defattr(644,root,root,755)
@@ -182,6 +188,8 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null
 %{_pkgconfigdir}/fontconfig.pc
 %{_mandir}/man3/*.3*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+%endif