rpms/cups/FC-5 .cvsignore, 1.22, 1.23 cups.spec, 1.230, 1.231 sources, 1.24, 1.25 cups-str2056.patch, 1.1, NONE cups-str2061.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-serv9803

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-str2056.patch cups-str2061.patch 
Log Message:
* Thu Nov  9 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.6-1.1
- 1.2.6.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	23 Oct 2006 13:49:36 -0000	1.22
+++ .cvsignore	9 Nov 2006 17:10:04 -0000	1.23
@@ -13,3 +13,4 @@
 cups-1.2.3-source.tar.bz2
 cups-1.2.4-source.tar.bz2
 cups-1.2.5-source.tar.bz2
+cups-1.2.6-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- cups.spec	6 Nov 2006 16:06:39 -0000	1.230
+++ cups.spec	9 Nov 2006 17:10:04 -0000	1.231
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.5
-Release: 1%{?dist}.4
+Version: 1.2.6
+Release: 1.1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -38,8 +38,6 @@
 Patch24: cups-maxlogsize.patch
 Patch32: cups-pid.patch
 Patch41: cups-relro.patch
-Patch42: cups-str2056.patch
-Patch43: cups-str2061.patch
 Patch44: cups-eggcups.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -134,8 +132,6 @@
 %patch24 -p1 -b .maxlogsize
 %patch32 -p1 -b .pid
 %patch41 -p1 -b .relro
-%patch42 -p1 -b .str2056
-%patch43 -p1 -b .str2061
 %patch44 -p1 -b .eggcups
 perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
 aclocal -I config-scripts
@@ -410,6 +406,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Nov  9 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.6-1.1
+- 1.2.6.
+
 * Mon Nov  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.5-1.4
 - One more D-Bus signal fix (bug #212763).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	23 Oct 2006 13:49:36 -0000	1.24
+++ sources	9 Nov 2006 17:10:04 -0000	1.25
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-3e5d2c127890fd3ed97e2249c278b6e8  cups-1.2.5-source.tar.bz2
+0669ad19cc8429af6e17176831aa3ed4  cups-1.2.6-source.tar.bz2


--- cups-str2056.patch DELETED ---


--- cups-str2061.patch DELETED ---