From f910f91a92616f50edd2d471ad5797cfa4c726bb Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Jul 20 2006 10:30:23 +0000
Subject: - 1.2.2.


---

diff --git a/.cvsignore b/.cvsignore
index 67677c1..cc870c6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,3 +11,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
+cups-1.2.2-source.tar.bz2
diff --git a/cups.spec b/cups.spec
index f91484f..d6304d0 100644
--- a/cups.spec
+++ b/cups.spec
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.1
-Release: 21 
+Version: 1.2.2
+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-svn5754.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -28,7 +27,6 @@ Patch4: cups-multilib.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch8: cups-compile.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
 Patch16: cups-no-export-ssllibs.patch
@@ -115,7 +113,6 @@ lpd emulation.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5754
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -123,7 +120,6 @@ lpd emulation.
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch8 -p1 -b .compile
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
 %patch16 -p1 -b .no-export-ssllibs
@@ -393,6 +389,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Jul 20 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.2-2
+- 1.2.2.
+
 * Wed Jul 19 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-21
 - Sync with svn5754.  Fixes bug #198987, bug #195532, bug #130118.
 
diff --git a/sources b/sources
index f6e97a1..5f14a0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-f804995e3f469bdefedc033510f6e6a5  cups-1.2.1-source.tar.bz2
+091de9109c9252cb37427859e90190ad  cups-1.2.2-source.tar.bz2