rpms/cups/devel .cvsignore, 1.30, 1.31 cups-directed-broadcast.patch, 1.2, 1.3 cups.spec, 1.341, 1.342 sources, 1.32, 1.33 cups-adminutil.patch, 1.1, NONE cups-str2408.patch, 1.1, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21811

Modified Files:
	.cvsignore cups-directed-broadcast.patch cups.spec sources 
Removed Files:
	cups-adminutil.patch cups-str2408.patch 
Log Message:
* Fri Jul 13 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-1
- 1.2.12.  No longer need adminutil or str2408 patches.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	13 Jun 2007 16:43:07 -0000	1.30
+++ .cvsignore	13 Jul 2007 09:17:56 -0000	1.31
@@ -21,3 +21,4 @@
 cups-1.2.9-source.tar.bz2
 cups-1.2.10-source.tar.bz2
 cups-1.2.11-source.tar.bz2
+cups-1.2.12-source.tar.bz2

cups-directed-broadcast.patch:

Index: cups-directed-broadcast.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-directed-broadcast.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-directed-broadcast.patch	14 Feb 2007 18:00:11 -0000	1.2
+++ cups-directed-broadcast.patch	13 Jul 2007 09:17:56 -0000	1.3
@@ -1,5 +1,5 @@
---- cups-1.2.8/conf/cupsd.conf.in.directed-broadcast	2006-04-23 22:46:38.000000000 +0100
-+++ cups-1.2.8/conf/cupsd.conf.in	2007-02-14 17:44:51.000000000 +0000
+--- cups-1.2.12/conf/cupsd.conf.in.directed-broadcast	2006-04-23 22:46:38.000000000 +0100
++++ cups-1.2.12/conf/cupsd.conf.in	2007-07-13 10:02:06.000000000 +0100
 @@ -20,6 +20,7 @@
  # Show shared printers on the local network.
  Browsing On
@@ -8,17 +8,18 @@
  BrowseAllow @LOCAL
  
  # Default authentication type, when authentication is required...
---- cups-1.2.8/cups/adminutil.c.directed-broadcast	2007-02-11 16:59:33.000000000 +0000
-+++ cups-1.2.8/cups/adminutil.c	2007-02-14 17:47:04.000000000 +0000
-@@ -1278,7 +1278,11 @@
+--- cups-1.2.12/cups/adminutil.c.directed-broadcast	2007-07-06 23:39:54.000000000 +0100
++++ cups-1.2.12/cups/adminutil.c	2007-07-13 10:03:15.000000000 +0100
+@@ -1288,7 +1288,12 @@
  	  cupsFilePuts(temp, "BrowseOrder allow,deny\n");
  
- 	  if (remote_printers > 0)
+ 	  if (new_remote_printers)
 +	  {
-+	    cupsFilePuts(temp, "# (Change '@LOCAL' to 'ALL' if using "
-+	                       "directed broadcasts from another subnet.)\n");
++	    cupsFilePuts(temp,
++			 "# (Change '@LOCAL' to 'ALL' if using "
++			 "directed broadcasts from another subnet.)\n");
  	    cupsFilePuts(temp, "BrowseAllow @LOCAL\n");
 +	  }
  
- 	  if (share_printers > 0)
+ 	  if (new_share_printers)
  	    cupsFilePuts(temp, "BrowseAddress @LOCAL\n");


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- cups.spec	9 Jul 2007 14:32:11 -0000	1.341
+++ cups.spec	13 Jul 2007 09:17:56 -0000	1.342
@@ -5,8 +5,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.11
-Release: 5%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -46,8 +46,6 @@
 Patch22: cups-af_unix-auth.patch
 Patch24: cups-str2109.patch
 Patch25: cups-usb-paperout.patch
-Patch26: cups-adminutil.patch
-Patch27: cups-str2408.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -156,8 +154,6 @@
 %patch22 -p1 -b .af_unix-auth
 %patch24 -p1 -b .str2109
 %patch25 -p1 -b .usb-paperout
-%patch26 -p1 -b .adminutil
-%patch27 -p1 -b .str2408
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -445,6 +441,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 13 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-1
+- 1.2.12.  No longer need adminutil or str2408 patches.
+
 * Mon Jul  9 2007 Tim Waugh <twaugh at redhat.com>
 - Another small improvement for the textonly filter (bug #244979).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	13 Jun 2007 16:43:07 -0000	1.32
+++ sources	13 Jul 2007 09:17:56 -0000	1.33
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-2742f1eec38abb04472b86627da8e493  cups-1.2.11-source.tar.bz2
+d410658468384b5ba5d04a808f6157fe  cups-1.2.12-source.tar.bz2


--- cups-adminutil.patch DELETED ---


--- cups-str2408.patch DELETED ---