From 62dfe30efdf85abd23bd8176440f1e6900c99661 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 19 Apr 2006 15:15:06 +0000
Subject: [PATCH] - Ignore .rpmnew and .rpmsave banner files.

---
 cups-banners.patch | 11 +++++++++++
 cups.spec          |  5 +++++
 2 files changed, 16 insertions(+)
 create mode 100644 cups-banners.patch

diff --git a/cups-banners.patch b/cups-banners.patch
new file mode 100644
index 0000000..6907c91
--- /dev/null
+++ b/cups-banners.patch
@@ -0,0 +1,11 @@
+--- cups-1.2rc2/scheduler/banners.c.banners	2006-04-19 16:12:07.000000000 +0100
++++ cups-1.2rc2/scheduler/banners.c	2006-04-19 16:12:42.000000000 +0100
+@@ -119,6 +119,8 @@
+     if ((ext = strrchr(dent->filename, '.')) != NULL)
+       if (!strcmp(ext, ".bck") ||
+           !strcmp(ext, ".bak") ||
++          !strcmp(ext, ".rpmnew") ||
++          !strcmp(ext, ".rpmsave") ||
+ 	  !strcmp(ext, ".sav"))
+ 	continue;
+ 
diff --git a/cups.spec b/cups.spec
index e473fb0..db78e0a 100644
--- a/cups.spec
+++ b/cups.spec
@@ -28,6 +28,7 @@ Patch3: cups-1.1.16-system-auth.patch
 Patch4: cups-1.1.17-backend.patch
 Patch5: cups-ext.patch
 Patch6: cups-kde.patch
+Patch7: cups-banners.patch
 Patch8: cups-logfileperm.patch
 Patch9: cups-1.1.17-rcp.patch
 Patch10: cups-1.1.17-ppdsdat.patch
@@ -115,6 +116,7 @@ lpd emulation.
 %patch4 -p1 -b .backend
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .kde
+%patch7 -p1 -b .banners
 %patch8 -p1 -b .logfileperm
 %patch9 -p1 -b .rcp
 %patch10 -p1 -b .ppdsdat
@@ -374,6 +376,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Apr 19 2006 Tim Waugh <twaugh@redhat.com>
+- Ignore .rpmnew and .rpmsave banner files.
+
 * Tue Apr 11 2006 Tim Waugh <twaugh@redhat.com>
 - Ship a /etc/cups/pdftops.conf file (bug #188583).