rpms/liberation-fonts/F-8 liberation-fonts.spec,1.8,1.9

[Caius Chance (cchance)]

Author: cchance

Update of /cvs/pkgs/rpms/liberation-fonts/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5638

Modified Files:
	liberation-fonts.spec 
Log Message:
* Thu Jan 17 2008 Caius Chance <cchance at redhat.com> - 1.0-1.fc8
- Update to latest version.




Index: liberation-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/liberation-fonts/F-8/liberation-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- liberation-fonts.spec	12 Sep 2007 12:22:53 -0000	1.8
+++ liberation-fonts.spec	17 Jan 2008 04:36:10 -0000	1.9
@@ -3,29 +3,36 @@
 
 Summary: Fonts to replace commonly used Microsoft Windows Fonts
 Name: liberation-fonts
-Version: 0.2
-Release: 3%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 License: GPLv2 with exceptions
 Group: User Interface/X
 URL: https://www.redhat.com/promo/fonts/
-Source0: https://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz
-Source1: 59-liberation-fonts.conf
+Source0: liberation-fonts.tar.gz
+Source1: 59-liberation-fonts.conf 
+Source2: COPYING
+Source3: License.txt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 Buildrequires: xorg-x11-font-utils
 
+
 %description
 The Liberation Fonts are intended to be replacements for the three
 most commonly used fonts on Microsoft systems: Times New Roman,
 Arial, and Courier New.
 
+
 %prep
-%setup -q
+%setup -q -n %{name} -a 0
+%{__cp} %{SOURCE2} %{SOURCE3} %{_builddir}/%{name}
+
 
 %clean
 rm -rf %{buildroot}
 
 %build
+%{nil}
 
 %install
 rm -rf %{buildroot}
@@ -35,7 +42,7 @@
 # configuration
 install -m 0755 -d %{buildroot}%{_sysconfdir}/fonts/conf.d
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/fonts/conf.d
-
+# catalogue
 install -d $RPM_BUILD_ROOT%{catalogue}
 ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
 
@@ -43,11 +50,13 @@
 mkfontdir %{buildroot}%{fontdir}
 mkfontscale %{buildroot}%{fontdir}
 
+
 %post
 if [ -x /usr/bin/fc-cache ]; then
   /usr/bin/fc-cache %{_datadir}/fonts
 fi
 
+
 %postun
 if [ "$1" = "0" ]; then
   if [ -x /usr/bin/fc-cache ]; then
@@ -55,17 +64,22 @@
   fi
 fi
 
+
 %files
 %defattr(-,root,root)
 %doc License.txt COPYING
 %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
+%config(noreplace) %{_sysconfdir}/fonts/conf.d/59-liberation-fonts.conf
 %{catalogue}/%{name}
 
+
 %changelog
+* Thu Jan 17 2008 Caius Chance <cchance at redhat.com> - 1.0-1.fc8
+- Update to latest version.
+
 * 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)