rpms/fonts-ISO8859-2/devel fonts-ISO8859-2.spec,1.18,1.19

[pnemade]

Author: pnemade

Update of /cvs/pkgs/rpms/fonts-ISO8859-2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19009

Modified Files:
	fonts-ISO8859-2.spec 
Log Message:
* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 1.0-22
- Fixed for Source Audit 2009-08-10




Index: fonts-ISO8859-2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-ISO8859-2/devel/fonts-ISO8859-2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- fonts-ISO8859-2.spec	24 Jul 2009 23:00:10 -0000	1.18
+++ fonts-ISO8859-2.spec	11 Aug 2009 04:04:02 -0000	1.19
@@ -1,5 +1,3 @@
-%define include_ulT1mo	0
-
 %define ISONAME ISO8859-2
 
 %define __mkfontdir umask 133;mkfontdir
@@ -9,12 +7,10 @@
 
 Name: fonts-%{ISONAME}
 Version: 1.0
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: MIT
-Source: http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz
-%if %{include_ulT1mo}
-Source1: http://www.intersoft.cz/linux/fonts/ulT1mo-beta-1.0.tar.gz
-%endif
+# Upstream url http://www.biz.net.pl/images/ISO8859-2-bdf.tar.gz is dead now.
+Source: ISO8859-2-bdf.tar.gz
 
 Patch0: XFree86-ISO8859-2-1.0-redhat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,43 +62,24 @@ were taken from the Internet or CDs.
 
 
 %prep
-%if %{include_ulT1mo}
-%setup -c -q -a 1
-%else
 %setup -c -q
-%endif
 
 %patch0 -p1 -b .redhat
 
 %build
 make all
-%if %{include_ulT1mo}
-make all -C ulT1mo-beta-1.0
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 DSTFONT=$RPM_BUILD_ROOT/usr/share/fonts/%{ISONAME}
 make install PREFIX=$RPM_BUILD_ROOT \
 	FONTDIR=$DSTFONT
-%if %{include_ulT1mo}
-mkdir -p $DSTFONT/Type1/{afm,pfm}
-(
-	cd ulT1mo-beta-1.0 ;
-	install -m 644 *.pfb fonts.{alias,dir,scale} $DSTFONT/Type1
-	install -m 644 afm/*.afm $DSTFONT/Type1/afm
-	install -m 644 pfm/*.pfm $DSTFONT/Type1/pfm
-)
-%endif
 
 # Install catalogue symlink
 mkdir -p $RPM_BUILD_ROOT%{catalogue}
 ln -sf %{fontdir}/misc $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2
 ln -sf %{fontdir}/75dpi $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-75dpi
 ln -sf %{fontdir}/100dpi $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-100dpi
-%if %{include_ulT1mo}
-ln -sf %{fontdir}/Type1 $RPM_BUILD_ROOT%{catalogue}/fonts-ISO8859-2-Type1
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,12 +99,6 @@ rm -rf $RPM_BUILD_ROOT
     %__mkfontdir /usr/share/fonts/%{ISONAME}/100dpi
 } &> /dev/null || :
 
-%if %{include_ulT1mo}
-%post Type1
-{
-    %__mkfontdir /usr/share/fonts/%{ISONAME}/Type1
-} &> /dev/null || :
-%endif
 
 %files
 %defattr(-,root,root)
@@ -158,23 +129,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{catalogue}
 %{catalogue}/fonts-ISO8859-2-100dpi
 
-%if %{include_ulT1mo}
-%files Type1
-%defattr(-,root,root)
-%dir /usr/share/fonts/%{ISONAME}/Type1
-%dir /usr/share/fonts/%{ISONAME}/Type1/afm
-%dir /usr/share/fonts/%{ISONAME}/Type1/pfm
-/usr/share/fonts/%{ISONAME}/Type1/afm/*
-/usr/share/fonts/%{ISONAME}/Type1/*.pfb
-/usr/share/fonts/%{ISONAME}/Type1/pfm/*
-%config(noreplace) %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.alias
-%verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.scale
-%ghost %verify(not md5 size mtime) /usr/share/fonts/%{ISONAME}/Type1/fonts.dir
-%dir %{catalogue}
-%{catalogue}/fonts-ISO8859-2-Type1
-%endif
-
 %changelog
+* Tue Aug 11 2009 Parag <pnemade at redhat.com> - 1.0-22
+- Fixed for Source Audit 2009-08-10
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild