rpms/liberation-fonts/devel liberation-fonts.spec,1.7,1.8

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/liberation-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29705

Modified Files:
	liberation-fonts.spec 
Log Message:
- add fontdir macro
- create fonts.dir and fonts.scale (reported by Mark Alford, #245961)                                                                            
- add catalogue symlink




Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/liberation-fonts/devel/liberation-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- liberation-fonts.spec	12 Sep 2007 06:43:17 -0000	1.7
+++ liberation-fonts.spec	12 Sep 2007 12:22:53 -0000	1.8
@@ -1,7 +1,10 @@
+%define fontdir %{_datadir}/fonts/liberation
+%define catalogue %{_sysconfdir}/X11/fontpath.d
+
 Summary: Fonts to replace commonly used Microsoft Windows Fonts
 Name: liberation-fonts
 Version: 0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
@@ -9,8 +12,7 @@
 Source1: 59-liberation-fonts.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-# for /etc/fonts/conf.d 
-Requires: fontconfig
+Buildrequires: xorg-x11-font-utils
 
 %description
 The Liberation Fonts are intended to be replacements for the three
@@ -28,12 +30,19 @@
 %install
 rm -rf %{buildroot}
 # fonts
-install -m 0755 -d %{buildroot}%{_datadir}/fonts/liberation
-install -m 0644 *.ttf %{buildroot}%{_datadir}/fonts/liberation
+install -m 0755 -d %{buildroot}%{fontdir}
+install -m 0644 *.ttf %{buildroot}%{fontdir}
 # configuration
 install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fonts/conf.d
 
+install -d $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
+
+# generate fonts.dir and fonts.scale
+mkfontdir %{buildroot}%{fontdir}
+mkfontscale %{buildroot}%{fontdir}
+
 %post
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache %{_datadir}/fonts
@@ -49,10 +58,19 @@
 %files
 %defattr(-,root,root)
 %doc License.txt COPYING
-%{_datadir}/fonts/liberation
+%dir %{fontdir}
 %config(noreplace) %{_sysconfdir}/fonts/conf.d/59-liberation-fonts.conf
+%{fontdir}/*.ttf
+%verify(not md5 size mtime) %{fontdir}/fonts.dir
+%verify(not md5 size mtime) %{fontdir}/fonts.scale
+%{catalogue}/%{name}
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-3.fc8
+- add fontdir macro
+- create fonts.dir and fonts.scale (reported by Mark Alford, #245961)
+- add catalogue symlink
+
 * Wed Sep 12 2007 Jens Petersen <petersen at redhat.com> - 0.2-2.fc8
 - update license field to GPLv2