rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.9,1.10

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 10 20:48:41 UTC 2006


Author: notting

Update of /cvs/dist/rpms/xorg-x11-xfs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13305

Modified Files:
	xorg-x11-xfs.spec 
Log Message:
fix %post noise (#176009, <ville.skytta at iki.fi>)



Index: xorg-x11-xfs.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-xfs.spec	16 Dec 2005 16:26:15 -0000	1.9
+++ xorg-x11-xfs.spec	10 Jan 2006 20:48:38 -0000	1.10
@@ -8,7 +8,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-%{pkgname}
 Version: 1.0.0
-Release: 1
+Release: 2
 # FIXME: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT/X11
@@ -215,7 +215,7 @@
     if [ -f $XFSCONFIG ] ; then
       # Remove Speedo font directories from xfs config if present to avoid
       # bug reports about xfs complaining about empty directories in syslog.
-      perl -p -i -e '\#^.*/.*/Speedo.*#d' $XFSCONFIG
+      perl -p -i -e 's#^.*/.*/Speedo.*\n##' $XFSCONFIG
 
       # On upgrades, remove /usr/X11R6 font path elements from the XFS config file
       if grep -q "/usr/X11R6/lib/X11/fonts" $XFSCONFIG &> /dev/null ; then
@@ -288,6 +288,9 @@
 %{_mandir}/man1/xfsinfo.1x*
 
 %changelog
+* Tue Jan 10 2006 Bill Nottingham <notting at redhat.com> 1:1.0.0-2
+- fix %post script (#176009, <ville.skytta at iki.fi>)
+
 * Fri Dec 16 2005 Mike A. Harris <mharris at redhat.com> 1:1.0.0-1
 - Updated all tarballs to version 1.0.0 from X11R7 RC4.
 - Get default X font directory with font-utils package 'fontdir' pkgconfig




More information about the fedora-cvs-commits mailing list