rpms/awstats/EL-5 awstats.spec,1.19,1.20

[Tim Jackson (timj)]

Author: timj

Update of /cvs/extras/rpms/awstats/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29486

Modified Files:
	awstats.spec 
Log Message:
awstats does not actually require httpd (#406901)
Fix cron script to be compatible with SELinux (#435101)
Mark httpd config as noreplace



Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/EL-5/awstats.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- awstats.spec	18 Sep 2007 09:55:42 -0000	1.19
+++ awstats.spec	16 Mar 2008 10:06:34 -0000	1.20
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.7
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPLv2
 Group:      Applications/Internet
@@ -16,7 +16,6 @@
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: checkpolicy, selinux-policy-devel
-Requires:   httpd
 Requires:   perl
 Requires(post): perl
 Requires(postun): /sbin/service
@@ -72,12 +71,9 @@
 ### Create cron job
 cat <<EOF >awstats.cron
 #!/bin/bash
-
-if [ -f %{_localstatedir}/log/httpd/access_log ] ; then
-        exec perl %{_datadir}/awstats/tools/awstats_updateall.pl now \
-                -configdir="%{_sysconfdir}/awstats" \
-                -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null
-fi
+exec %{_datadir}/awstats/tools/awstats_updateall.pl now \
+        -configdir="%{_sysconfdir}/awstats" \
+        -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null
 exit 0
 EOF
 
@@ -183,7 +179,7 @@
 %files
 %defattr(-,root,root,755)
 # Apache configuration file
-%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 %config(noreplace) %attr(755,root,root) %{_sysconfdir}/cron.hourly/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_localstatedir}/lib/%{name}
@@ -202,7 +198,6 @@
 %{_datadir}/%{name}/wwwroot/icon
 %{_datadir}/%{name}/wwwroot/js
 
-
 %files selinux
 %defattr(644, root, root, 755)
 %doc README.SELinux
@@ -210,5 +205,10 @@
 
 
 %changelog
+* Sun Mar 16 2008 Tim Jackson <rpm at timj.co.uk> 6.7-2
+- awstats does not actually require httpd (#406901)
+- Fix cron script to be compatible with SELinux (#435101)
+- Mark httpd config as noreplace
+
 * Tue Sep 18 2007 Tim Jackson <rpm at timj.co.uk> 6.7-1
 - initial import to EPEL-5, from Fedora