From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 13 Jan 2011 17:17:49 +0000 (+0000)
Subject: - up to 7.0
X-Git-Tag: auto/ac/awstats-7_0-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Fheads%2FAC-branch;p=packages%2Fawstats.git

- up to 7.0

Changed files:
    awstats-PLD.patch -> 1.5
    awstats.spec -> 1.61
---

diff --git a/awstats-PLD.patch b/awstats-PLD.patch
index ae54850..23962b9 100644
--- a/awstats-PLD.patch
+++ b/awstats-PLD.patch
@@ -73,14 +73,13 @@ diff -Nur b.awstats-6.6/tools/awstats_updateall.pl n.awstats-6.6/tools/awstats_u
  		$AwstatsFound=1;
  	}
  	if (! $AwstatsFound) {
---- awstats-6.95/wwwroot/cgi-bin/awstats.pl.orig	2010-05-19 12:48:28.000000000 +0200
-+++ awstats-6.95/wwwroot/cgi-bin/awstats.pl	2010-05-19 13:15:39.000000000 +0200
-@@ -1733,7 +1733,7 @@ sub Read_Config {
- 	}
- 	else {
- 		@PossibleConfigDir = (
--			"$DIR",                   "/etc/awstats",
-+			"$DIR", "/etc/webapps/awstats", "/etc/awstats",
+--- awstats-7.0/wwwroot/cgi-bin/awstats.pl~	2011-01-13 13:23:54.000000000 +0200
++++ awstats-7.0/wwwroot/cgi-bin/awstats.pl	2011-01-13 14:22:50.921961909 +0200
+@@ -1712,6 +1712,7 @@
+ 	my $configdir         = shift;
+ 	my @PossibleConfigDir = (
+ 			"$DIR",
++			"/etc/webapps/awstats",
+ 			"/etc/awstats",
  			"/usr/local/etc/awstats", "/etc",
  			"/etc/opt/awstats"
- 		);
diff --git a/awstats.spec b/awstats.spec
index 5931a12..cb056be 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -8,12 +8,12 @@
 Summary:	Advanced Web Statistics is a free powerful server log file analyzer
 Summary(pl.UTF-8):	Zaawansowany program do analizowania logów serwera
 Name:		awstats
-Version:	6.95
+Version:	7.0
 Release:	1
 License:	GPL v2
 Group:		Applications/Networking
 Source0:	http://awstats.sourceforge.net/files/%{name}-%{version}.tar.gz
-# Source0-md5:	26a5b19fa9f395e9e7dafed37b795d7f
+# Source0-md5:	3e8e09b9ebe74513bb34290dbcd37b45
 Source1:	%{name}.crontab
 Source2:	%{name}-httpd.conf
 Source3:	%{name}.conf