rpms/cups/FC-5 .cvsignore, 1.20, 1.21 cups.spec, 1.223, 1.224 sources, 1.22, 1.23 cups-no-propagate-ipp-port.patch, 1.2, NONE cups-str1968.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv15166

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-no-propagate-ipp-port.patch cups-str1968.patch 
Log Message:
* Fri Sep 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.4-1.1
- 1.2.4 (fixes bug #206763).  No longer need str1968 patch.
- No longer need no-propagate-ipp-port patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	30 Aug 2006 14:57:36 -0000	1.20
+++ .cvsignore	22 Sep 2006 17:10:54 -0000	1.21
@@ -11,3 +11,4 @@
 cups-1.2.1-source.tar.bz2
 cups-1.2.2-source.tar.bz2
 cups-1.2.3-source.tar.bz2
+cups-1.2.4-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- cups.spec	13 Sep 2006 16:23:22 -0000	1.223
+++ cups.spec	22 Sep 2006 17:10:54 -0000	1.224
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.3
-Release: 1.6
+Version: 1.2.4
+Release: 1.1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -23,7 +23,6 @@
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
-Patch4: cups-str1968.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -37,7 +36,6 @@
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
-Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
 Patch41: cups-relro.patch
 Epoch: 1
@@ -118,7 +116,6 @@
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
-%patch4 -p1 -b .str1968
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -132,7 +129,6 @@
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
-%patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
@@ -407,6 +403,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Sep 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.4-1.1
+- 1.2.4 (fixes bug #206763).  No longer need str1968 patch.
+- No longer need no-propagate-ipp-port patch.
+
 * Wed Sep 13 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.3-1.6
 - Turn off DEBUG again.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	30 Aug 2006 14:57:36 -0000	1.22
+++ sources	22 Sep 2006 17:10:54 -0000	1.23
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-7f65bae0054cd8335824942595d867ef  cups-1.2.3-source.tar.bz2
+528650aba3b56541f75370ef09541850  cups-1.2.4-source.tar.bz2


--- cups-no-propagate-ipp-port.patch DELETED ---


--- cups-str1968.patch DELETED ---