rpms/cups/devel .cvsignore, 1.19, 1.20 cups.spec, 1.202, 1.203 sources, 1.21, 1.22 cups-svn.patch, 1.10, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	.cvsignore cups.spec sources 
Removed Files:
	cups-svn.patch 
Log Message:
* Mon May 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-2
- 1.2.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	8 May 2006 21:55:43 -0000	1.19
+++ .cvsignore	22 May 2006 21:19:04 -0000	1.20
@@ -10,3 +10,4 @@
 cups-1.2rc2-source.tar.bz2
 cups-1.2rc3-source.tar.bz2
 cups-1.2.0-source.tar.bz2
+cups-1.2.1-source.tar.bz2


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- cups.spec	22 May 2006 18:13:40 -0000	1.202
+++ cups.spec	22 May 2006 21:19:04 -0000	1.203
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.0
-Release: 7
+Version: 1.2.1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,7 +20,6 @@
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -108,7 +107,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p0 -b .svn
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -379,7 +377,8 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon May 22 2006 Tim Waugh <twaugh at redhat.com>
+* Mon May 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.1-2
+- 1.2.1.
 - Fixed devel package multilib conflict (bug #192664).
 
 * Mon May 22 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-7


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	8 May 2006 21:55:44 -0000	1.21
+++ sources	22 May 2006 21:19:04 -0000	1.22
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-a168b0b1c8bb946060e659e1df2927c5  cups-1.2.0-source.tar.bz2
+f804995e3f469bdefedc033510f6e6a5  cups-1.2.1-source.tar.bz2


--- cups-svn.patch DELETED ---