SPECS: fonts-TTF-RedHat-liberation.spec - merged with liberation-f...

[glen]

Author: glen                         Date: Tue May 15 11:02:01 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged with liberation-fonts-ttf.spec

---- Files affected:
SPECS:
   fonts-TTF-RedHat-liberation.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/fonts-TTF-RedHat-liberation.spec
diff -u SPECS/fonts-TTF-RedHat-liberation.spec:1.3 SPECS/fonts-TTF-RedHat-liberation.spec:1.4
--- SPECS/fonts-TTF-RedHat-liberation.spec:1.3	Mon May 14 22:24:12 2007
+++ SPECS/fonts-TTF-RedHat-liberation.spec	Tue May 15 13:01:55 2007
@@ -8,10 +8,12 @@
 License:	GPL v2 + exceptions
 Group:		Fonts
 Source0:	%{_name}-%{version}.tar.gz
+Source0:	https://www.redhat.com/f/fonts/%{_name}-2.tar.gz
 # Source0-md5:	a874631c4641e8496cd9be5c7da74b48
 URL:		https://www.redhat.com/promo/fonts/
 Requires(post,postun):	fontpostinst
 Requires:	%{_fontsdir}/TTF
+Obsoletes:	liberation-fonts-ttf
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -19,21 +21,20 @@
 
 %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.
+most commonly used fonts on Microsoft systems: Times New Roman, Arial,
+and Courier New.
 
 %description -l pl.UTF-8
 Fonty Liberation mają być zamiennikami trzech najczęściej używanych
 fontów z systemów Microsoftu: Times New Roman, Arial i Courier New.
 
 %prep
-%setup -c -n %{_name}
+%setup -q -c -n %{_name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_ttffontsdir}
-
-install *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
+cp -a *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,6 +55,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2007/05/15 11:01:55  glen
+- merged with liberation-fonts-ttf.spec
+
 Revision 1.3  2007/05/14 20:24:12  qboosh
 - pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fonts-TTF-RedHat-liberation.spec?r1=1.3&r2=1.4&f=u