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

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
* Wed May  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-5
- Restart cupsd if "ServerAlias *" is added to cupsd.conf
  (bug #497354).
- Ship "ServerAlias *" in cupsd.conf.default configuration file as
  well (bug #498884).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-10/cups.spec,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -p -r1.462 -r1.463
--- cups.spec	27 Apr 2009 15:57:42 -0000	1.462
+++ cups.spec	6 May 2009 12:08:40 -0000	1.463
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.10
-Release: 4%{?svn:.svn%{svn}}%{?dist}
+Release: 5%{?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
@@ -294,13 +294,15 @@ ln -s ipp $RPM_BUILD_ROOT%{cups_serverbi
 
 # Disable Host: checking by default for compatibility.  The
 # ServerAlias directive was added in 1.3.10.
-cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd.conf
+for suffix in conf conf.default; do
+  cat <<"EOF" >> $RPM_BUILD_ROOT%{_sysconfdir}/cups/cupsd."$suffix"
 
 # You should list each hostname alias used for this server so that it
 # can verify the correct name is used for it.  Using "ServerAlias *"
 # disables checking.
 ServerAlias *
 EOF
+done
 
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
@@ -375,6 +377,7 @@ if [ "$1" -gt 0 ]; then
 # disables checking.
 ServerAlias *
 EOF
+        /sbin/service cups condrestart > /dev/null 2>&1 || :
     fi
 fi
 
@@ -505,6 +508,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Wed May  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.3.10-5
+- Restart cupsd if "ServerAlias *" is added to cupsd.conf
+  (bug #497354).
+- Ship "ServerAlias *" in cupsd.conf.default configuration file as
+  well (bug #498884).
+
 * 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