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

- added static_libs bcond, rel. 2

Changed files:
    fontconfig.spec -> 1.68

diff --git a/fontconfig.spec b/fontconfig.spec
index eb564da35f2c9f23fe2c2147237279ff12bd583f..d572a260eb8587c3661ae01254658e87c56d7963 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,13 +1,14 @@
 #
 # 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.95
-Release:       1
+Release:       2
 Epoch:         1
 License:       MIT
 Group:         Libraries
@@ -15,6 +16,7 @@ Source0:      http://fontconfig.org/release/%{name}-%{version}.tar.gz
 # Source0-md5: 6860be35882f6d34636d52345efd5944
 Patch0:                %{name}-blacklist.patch
 Patch1:                %{name}-autohint.patch
+Patch2:                %{name}-cmap-parsing.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -125,6 +127,7 @@ Este pacote cont
 %if %{with bytecode}
 %patch1 -p1
 %endif
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -133,7 +136,8 @@ Este pacote cont
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-docs
+       --disable-docs \
+       %{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
@@ -184,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