- up to 2.11.1

[packages/fontconfig.git] / fontconfig.spec

diff --git a/fontconfig.spec b/fontconfig.spec
index af6117503b1f0f8109071a03d4e3b2ca0663ccf3..f51fac1c0ca54bf5ee99a221812c58e966c33723 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,30 +1,25 @@
-# TODO:
-# - upgrade puts new files into /usr/share/fontconfig/conf.avail/*.conf
-# and also removes /etc/fonts/conf.avail/*.conf BUT there is a symlink
-# /etc/fonts/conf.avail/ -> /usr/share/fontconfig/conf.avail/ and in the end
-# rpm deletes freshly installed /usr/share/fontconfig/conf.avail/*.conf files
-
+#
 # Conditional build
 %bcond_without static_libs     # don't build static library
-%bcond_without doc
-#
+%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.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:       0.1
+Version:       2.11.1
+Release:       1
 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: 824d000eb737af6e16c826dd3b2d6c90
 Source1:       %{name}-lcd-filter.conf
-Patch0:                %{name}-blacklist.patch
-Patch1:                %{name}-bitstream-cyberbit.patch
+Patch0:                %{name}-bitstream-cyberbit.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
@@ -132,11 +127,10 @@ Este pacote contém a biblioteca estática do fontconfig
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -145,11 +139,13 @@ Este pacote contém a biblioteca estática do fontconfig
 export HASDOCBOOK=no
 
 %configure \
-       --%{?with_doc:en}%{!?with_doc:dis}able-docs \
+       --enable-docs%{!?with_doc:=no} \
        --disable-silent-rules \
-       %{!?with_static_libs:--disable-static}
+       --%{?with_static_libs:en}%{!?with_static_libs:dis}able-static
 %{__make}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig} \
@@ -164,11 +160,21 @@ install %{SOURCE1} \
 
 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 || :
@@ -181,9 +187,10 @@ HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null || :
 %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/conf.avail
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}/fonts.dtd
-%{_sysconfdir}/fonts/conf.avail
+%dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/conf.avail
 %{_datadir}/%{name}/conf.avail/*.conf
 %dir %{_sysconfdir}/fonts/conf.d
@@ -196,11 +203,12 @@ 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*
 %endif
-/var/cache/fontconfig
+%dir /var/cache/fontconfig
 
 %files libs
 %defattr(644,root,root,755)