From c7f768300f60e7769f61a46b1d4d614ad671a74c Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: May 22 2006 21:19:04 +0000
Subject: - 1.2.1.


---

diff --git a/.cvsignore b/.cvsignore
index d547511..67677c1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,4 @@ cups-1.2rc1-source.tar.bz2
 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
diff --git a/cups.spec b/cups.spec
index ebe8167..bdbf402 100644
--- a/cups.spec
+++ b/cups.spec
@@ -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 @@ Source10: ncp.backend
 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 @@ lpd emulation.
 
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Mon May 22 2006 Tim Waugh <twaugh@redhat.com>
+* Mon May 22 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-2
+- 1.2.1.
 - Fixed devel package multilib conflict (bug #192664).
 
 * Mon May 22 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-7
diff --git a/sources b/sources
index c88f638..f6e97a1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-a168b0b1c8bb946060e659e1df2927c5  cups-1.2.0-source.tar.bz2
+f804995e3f469bdefedc033510f6e6a5  cups-1.2.1-source.tar.bz2