From 0dd9407ca4b29d7d49c44237d8160134b74fc27c Mon Sep 17 00:00:00 2001
From: Tim Jackson <timj@fedoraproject.org>
Date: Dec 15 2008 03:48:35 +0000
Subject: remove extraneous file awstats.orig from package


---

diff --git a/awstats-6.7-CVE-2008-3714.patch b/awstats-6.7-CVE-2008-3714.patch
index 3878464..2dd85d7 100644
--- a/awstats-6.7-CVE-2008-3714.patch
+++ b/awstats-6.7-CVE-2008-3714.patch
@@ -1,6 +1,6 @@
 diff -ur awstats-6.7/wwwroot/cgi-bin/awstats.pl awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin/awstats.pl
 --- awstats-6.7/wwwroot/cgi-bin/awstats.pl	2007-07-07 12:00:06.000000000 +0100
-+++ awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin/awstats.pl	2008-12-06 15:01:44.000000000 +0000
++++ awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin/awstats.pl	2008-12-14 17:25:46.000000000 +0000
 @@ -4381,6 +4381,7 @@
  	my $stringtodecode=shift;
  	$stringtodecode =~ tr/\+/ /s;
@@ -9,4 +9,3 @@ diff -ur awstats-6.7/wwwroot/cgi-bin/awstats.pl awstats-6.7-CVE-2008-3714/wwwroo
  	return $stringtodecode;
  }
  
-Only in awstats-6.7-CVE-2008-3714/wwwroot/cgi-bin: awstats.pl.orig
diff --git a/awstats.spec b/awstats.spec
index 3bf2e95..8b80359 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.7
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
@@ -54,6 +54,10 @@ This package adds SELinux enforcement to AWstats.
 %setup -q
 %patch0 -p0
 %patch1 -p1
+
+# patch creates backups even though it shouldn't
+rm wwwroot/cgi-bin/awstats.pl.orig
+
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 # Fix some bad file permissions here for convenience.
@@ -215,6 +219,9 @@ fi
 
 
 %changelog
+* Mon Dec 15 2008 Tim Jackson <rpm@timj.co.uk> 6.7-5
+- remove extraneous file awstats.orig from package
+
 * Sat Dec 06 2008 Tim Jackson <rpm@timj.co.uk> 6.7-4
 - Use Debian's patch for CVE-2008-3714 (#474396)
 - Add README.Fedora file pointing people towards the -selinux subpackage