From 2c2048432d17095d399ff87e5a1cf413f9ab133e Mon Sep 17 00:00:00 2001
From: Aurelien Bompard <abompard@fedoraproject.org>
Date: Oct 30 2006 14:05:09 +0000
Subject: fix dos encoding on logresolvemerge.pl (bug 212965)


---

diff --git a/awstats.spec b/awstats.spec
index 4074413..f9c1257 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.6
-Release:    0.2.beta%{?dist}
+Release:    0.3.beta%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -40,7 +40,7 @@ perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
 chmod -x tools/httpd_conf
 find tools/xslt -type f | xargs chmod -x
 # Remove \r in conf file (file written on MS Windows)
-perl -pi -e 's/\r//g' tools/httpd_conf
+perl -pi -e 's/\r//g' tools/httpd_conf tools/logresolvemerge.pl
 # SELinux README
 cp -a %{SOURCE1} README.SELinux
 
@@ -173,6 +173,9 @@ fi
 
 
 %changelog
+* Mon Oct 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 6.6-0.3.beta
+- fix DOS encoding on logresolvemerge.pl
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 6.6-0.2.beta
 - rebuild