rpms/cups/F-10 cups.spec,1.461,1.462

Tim Waugh twaugh at fedoraproject.org
Mon Apr 27 15:58:12 UTC 2009


Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5304

Modified Files:
	cups.spec 
Log Message:
Better grep pattern for ServerAlias.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- cups.spec	27 Apr 2009 15:41:46 -0000	1.461
+++ cups.spec	27 Apr 2009 15:57:42 -0000	1.462
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 3%{?svn:.svn%{svn}}%{?dist}
+Release: 4%{?svn:.svn%{svn}}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -55,7 +55,7 @@
 Epoch: 1
 Url: http://www.cups.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-PreReq: /sbin/chkconfig /sbin/service
+PreReq: /sbin/chkconfig /sbin/service /bin/grep
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 %if %use_alternatives
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
@@ -366,7 +366,7 @@
 %triggerpostun -- %{name} < 1:1.3.10-3
 if [ "$1" -gt 0 ]; then
     CONF=%{_sysconfdir}/cups/cupsd.conf
-    if ! grep -q ServerAlias "$CONF"; then
+    if ! grep -qiw ServerAlias "$CONF"; then
         cp -a "$CONF" "$CONF".rpmorig
         cat <<"EOF" >> "$CONF"
 
@@ -505,7 +505,7 @@
 %{_libdir}/php/modules/*.so
 
 %changelog
-* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-3
+* Mon Apr 27 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-4
 - Adjust cupsd.conf by adding "ServerAlias *" automatically on upgrade
   (part of bug #497301).  The default cupsd.conf now includes this
   line as well.




More information about the fedora-extras-commits mailing list