rpms/cups/F-8 .cvsignore, 1.38, 1.39 cups-lspp.patch, 1.28, 1.29 cups.spec, 1.383, 1.384 sources, 1.41, 1.42 cups-str2650.patch, 1.1, NONE cups-str2664.patch, 1.1, NONE cups-str2703.patch, 1.1, NONE

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	.cvsignore cups-lspp.patch cups.spec sources 
Removed Files:
	cups-str2650.patch cups-str2664.patch cups-str2703.patch 
Log Message:
* Wed Feb 20 2008 Tim Waugh <twaugh at redhat.com> 1.3.6-1
- 1.3.6.  No longer need str2650, str2664, or str2703 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	3 Jan 2008 16:16:13 -0000	1.38
+++ .cvsignore	20 Feb 2008 10:24:46 -0000	1.39
@@ -30,3 +30,4 @@
 cups-1.3.3-source.tar.bz2
 cups-1.3.4-source.tar.bz2
 cups-1.3.5-source.tar.bz2
+cups-1.3.6-source.tar.bz2

cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups-lspp.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cups-lspp.patch	12 Nov 2007 18:41:33 -0000	1.28
+++ cups-lspp.patch	20 Feb 2008 10:24:46 -0000	1.29
@@ -1297,7 +1297,7 @@
 +	    {
 +	      if (getfilecon(con->filename, &spoolcon) == -1)
 +	      {
-+		cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		return (cupsdCloseClient(con));
 +	      }
 +	      clicon = context_new(con->scon);
@@ -1305,7 +1305,7 @@
 +	      freecon(spoolcon);
 +	      if (!clicon || !tmpcon)
 +	      {
-+		cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		if (clicon)
 +		  context_free(clicon);
 +		if (tmpcon)
@@ -1320,7 +1320,7 @@
 +		{
 +		  if (context_range_set(tmpcon, cliclearance) == -1)
 +		  {
-+		    cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		    cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		    free(clirange);
 +		    context_free(tmpcon);
 +		    context_free(clicon);
@@ -1331,7 +1331,7 @@
 +		{
 +		  if (context_range_set(tmpcon, (context_range_get(clicon))) == -1)
 +		  {
-+		    cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		    cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		    free(clirange);
 +		    context_free(tmpcon);
 +		    context_free(clicon);
@@ -1342,7 +1342,7 @@
 +	      }
 +	      if (setfilecon(con->filename, context_str(tmpcon)) == -1)
 +	      {
-+		cupsdSendError(con, HTTP_SERVER_ERROR, AUTH_NONE);
++		cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE);
 +		context_free(tmpcon);
 +		context_free(clicon);
 +		return (cupsdCloseClient(con));


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- cups.spec	12 Feb 2008 16:38:46 -0000	1.383
+++ cups.spec	20 Feb 2008 10:24:46 -0000	1.384
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.3.5
-Release: 3%{?dist}
+Version: 1.3.6
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -41,13 +41,10 @@
 Patch15: cups-undo-str2537.patch
 Patch16: cups-pid.patch
 Patch17: cups-foomatic-recommended.patch
-Patch18: cups-str2650.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-strict-ppd-line-length.patch
-Patch23: cups-str2664.patch
-Patch24: cups-str2703.patch
 Patch25: cups-usb-paperout.patch
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -156,13 +153,10 @@
 %patch15 -p1 -b .undo-str2537
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .foomatic-recommended
-%patch18 -p1 -b .str2650
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .strict-ppd-line-length
-%patch23 -p1 -b .str2664
-%patch24 -p1 -b .str2703
 %patch25 -p1 -b .usb-paperout
 
 %if %lspp
@@ -186,6 +180,7 @@
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
+	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -455,6 +450,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Feb 20 2008 Tim Waugh <twaugh at redhat.com> 1.3.6-1
+- 1.3.6.  No longer need str2650, str2664, or str2703 patches.
+
 * Tue Feb 12 2008 Tim Waugh <twaugh at redhat.com> 1.3.5-3
 - Fixed admin.cgi handling of DefaultAuthType (bug #432478, STR #2703).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources	3 Jan 2008 16:16:13 -0000	1.41
+++ sources	20 Feb 2008 10:24:46 -0000	1.42
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-355705c528e9a8d0d439da15454d79a6  cups-1.3.5-source.tar.bz2
+642f9f6d879999bff1b51aeee57a3ce1  cups-1.3.6-source.tar.bz2


--- cups-str2650.patch DELETED ---


--- cups-str2664.patch DELETED ---


--- cups-str2703.patch DELETED ---