- updated to 2.3.0

[packages/fontconfig.git] / fontconfig.spec

diff --git a/fontconfig.spec b/fontconfig.spec
index fe65e6fb295428bf4175e41cc02e621fe939b1b3..4c2843411199f77366aeeed383d6b1fea7ee132e 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -5,13 +5,13 @@
 Summary:       Font configuration and customization tools
 Summary(pl):   Narzêdzia do konfigurowania fontów
 Name:          fontconfig
-Version:       2.2.98
-Release:       2
+Version:       2.3.0
+Release:       1
 Epoch:         1
 License:       MIT
 Group:         Libraries
 Source0:       http://fontconfig.org/release/%{name}-%{version}.tar.gz
-# Source0-md5: f13af7e7dfa4e1d68aeb9dcc8d12045a
+# Source0-md5: a4dea0b513c5d4f88bbf0e78099dbaba
 Patch0:                %{name}-blacklist.patch
 Patch1:                %{name}-autohint.patch
 Patch2:                %{name}-autohint2.patch
@@ -24,7 +24,7 @@ BuildRequires:        ed
 BuildRequires: expat-devel
 BuildRequires: freetype-devel >= 2.1.5
 BuildRequires: libtool
-Requires       %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      freetype >= 2.1.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -138,18 +138,21 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man{1,3,5}
 install doc/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
 install doc/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
+cp -f conf.d/README README.confd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-HOME=/root %{_bindir}/fc-cache -f 2>/dev/null
+umask 022
+HOME=/tmp %{_bindir}/fc-cache -f 2>/dev/null
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog README README.confd
 %attr(755,root,root) %{_bindir}/fc-*
 %{_mandir}/man1/*.1*
 %{_mandir}/man5/*.5*
@@ -158,8 +161,9 @@ HOME=/root %{_bindir}/fc-cache -f 2>/dev/null
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/fonts
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/fonts.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/local.conf
 %{_sysconfdir}/fonts/fonts.dtd
+%dir %{_sysconfdir}/fonts/conf.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fonts/conf.d/*.conf
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel