rpms/urw-fonts/devel .cvsignore, 1.8, 1.9 sources, 1.10, 1.11 urw-fonts.spec, 1.26, 1.27

[Than Ngo (than)]

Author: than

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

Modified Files:
	.cvsignore sources urw-fonts.spec 
Log Message:
- update to 1.0.7pre43, changed Roman glyphs in all fonts back
  to original metrics. bz#243180, bz#138896, bz#140584
- cleanup BR, bz#227297




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/urw-fonts/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	24 Feb 2005 11:54:02 -0000	1.8
+++ .cvsignore	10 Aug 2007 15:28:45 -0000	1.9
@@ -1,2 +1,3 @@
 urw-fonts-1.0.7pre38.tar.bz2
 urw-fonts-1.0.7pre40.tar.bz2
+urw-fonts-1.0.7pre43.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/urw-fonts/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	24 Feb 2005 11:54:02 -0000	1.10
+++ sources	10 Aug 2007 15:28:45 -0000	1.11
@@ -1 +1 @@
-316c05d15d84e3b9aa4e862eb5b7b651  urw-fonts-1.0.7pre40.tar.bz2
+97ff7f315bcf36558d7f326878551ac3  urw-fonts-1.0.7pre43.tar.bz2


Index: urw-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/urw-fonts/devel/urw-fonts.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- urw-fonts.spec	12 Jul 2006 08:37:35 -0000	1.26
+++ urw-fonts.spec	10 Aug 2007 15:28:45 -0000	1.27
@@ -1,27 +1,20 @@
-%define filippov_version 1.0.7pre40
+%define filippov_version 1.0.7pre43
 %define fontdir %{_datadir}/fonts/default/Type1
+%define catalogue /etc/X11/fontpath.d
 
 Summary: Free versions of the 35 standard PostScript fonts.
 Name: urw-fonts
-Version: 2.3
-Release: 6.1.1
+Version: 2.4
+Release: 1%{?dist}
 Source: ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{filippov_version}.tar.bz2
-Source1: n022003l.afm
-Source2: n022003l.pfb
-Source3: n022004l.afm
-Source4: n022004l.pfb
-Source5: n022023l.afm
-Source6: n022023l.pfb
-Source7: n022024l.afm
-Source8: n022024l.pfb
 URL: ftp://ftp.gnome.ru/fonts/urw/release/
 License: GPL, URW holds copyright
 Group: User Interface/X
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
-Requires(post): chkfontpath, fontconfig, mkfontscale, mkfontdir
-Requires(postun): chkfontpath, fontconfig
+Requires(post): fontconfig
+Requires(postun): fontconfig
 
 %description 
 Free, good quality versions of the 35 standard PostScript(TM) fonts,
@@ -41,19 +34,18 @@
 mkdir -p $RPM_BUILD_ROOT%{fontdir}
 install -m 0644 *.afm *.pfb $RPM_BUILD_ROOT%{fontdir}/
 
-# resize NimbusMonL
-install -m 0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} \
-	%{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} $RPM_BUILD_ROOT%{fontdir}/
-
 # Touch ghosted files
 touch $RPM_BUILD_ROOT%{fontdir}/{fonts.{dir,scale,cache-1},encodings.dir}
 
+# Install catalogue symlink
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-default
+
 %post
 {
    umask 133
-   mkfontscale %{fontdir}
-   `which mkfontdir` %{fontdir}
-   /usr/sbin/chkfontpath -q -a %{fontdir}
+   mkfontscale %{fontdir} || :
+   `which mkfontdir` %{fontdir} || :
    fc-cache %{_datadir}/fonts
 } &> /dev/null || :
 
@@ -61,7 +53,6 @@
 {
    if [ "$1" = "0" ]; then
       fc-cache %{_datadir}/fonts
-      /usr/sbin/chkfontpath -q -r %{fontdir} || :
    fi
 } &> /dev/null || :
 
@@ -70,9 +61,10 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc COPYING README README.tweaks TODO
+%doc COPYING README README.tweaks
 %dir %{_datadir}/fonts/default
 %dir %{fontdir}
+%{catalogue}/fonts-default
 %ghost %verify(not md5 size mtime) %{fontdir}/fonts.dir
 %ghost %verify(not md5 size mtime) %{fontdir}/fonts.scale
 %ghost %verify(not md5 size mtime) %{fontdir}/fonts.cache-1
@@ -81,6 +73,11 @@
 %{fontdir}/*.pfb
 
 %changelog
+* Fri Aug 10 2007 Than Ngo <than at redhat.com> - 2.4-1
+- update to 1.0.7pre43, changed Roman glyphs in all fonts back
+  to original metrics. bz#243180, bz#138896, bz#140584
+- cleanup BR, bz#227297
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.3-6.1.1
 - rebuild