rpms/cups/F-9 cups-lspp.patch,1.31,1.32 cups.spec,1.412,1.413

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4224

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Thu May 29 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-4
- Fix last fix (bug #447200).


cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups-lspp.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cups-lspp.patch	28 May 2008 09:03:04 -0000	1.31
+++ cups-lspp.patch	29 May 2008 16:02:23 -0000	1.32
@@ -1156,7 +1156,7 @@
    fchmod(cupsFileNumber(out), 0640);
    fchown(cupsFileNumber(out), RunUser, Group);
 +#ifdef WITH_LSPP
-+  if (con->scon != NULL &&
++  if (con != NULL && con->scon != NULL &&
 +      strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0)
 +  {
 +    if (getfilecon(filename, &spoolcon) == -1)


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-9/cups.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- cups.spec	28 May 2008 09:04:52 -0000	1.412
+++ cups.spec	29 May 2008 16:02:23 -0000	1.413
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.7
-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
@@ -442,6 +442,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu May 29 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-4
+- Fix last fix (bug #447200).
+
 * Wed May 28 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.7-3
 - If cupsdTimeoutJob is called when the originating connection is still
   known, pass that to the function so that copy_banner can get at it if