rpms/webalizer/devel webalizer.spec,1.30,1.31

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/webalizer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27063

Modified Files:
	webalizer.spec 
Log Message:
* Thu Feb  7 2008 Joe Orton <jorton at redhat.com> 2.01_10-35
- use %{_localestatedir}, remove tabs, require httpd not
  webserver, mark webalizer.conf config(noreplace) (#226536)



Index: webalizer.spec
===================================================================
RCS file: /cvs/extras/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- webalizer.spec	30 Aug 2007 13:58:10 -0000	1.30
+++ webalizer.spec	7 Feb 2008 16:21:43 -0000	1.31
@@ -5,7 +5,7 @@
 Summary: A flexible Web server log file analysis program
 Group: Applications/Internet
 Version: 2.01_10
-Release: 34
+Release: 35
 URL: http://www.mrunix.net/webalizer/
 License: GPLv2+
 Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tar.bz2
@@ -31,7 +31,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gd-devel, db4-devel
 Requires(pre): /usr/sbin/useradd
-Requires: webserver, crontabs
+Requires: httpd, crontabs
 
 %description
 The Webalizer is a Web server log analysis program. It is designed to
@@ -71,15 +71,16 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir} \
          $RPM_BUILD_ROOT/%{_mandir}/man1 \
-         $RPM_BUILD_ROOT/var/www/usage \
+         $RPM_BUILD_ROOT%{_localstatedir}/www/usage \
          $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 
-mkdir -p $RPM_BUILD_ROOT/var/lib/webalizer
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/webalizer
 
 %makeinstall
 install -p -m 644 $RPM_SOURCE_DIR/webalizer.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install -p -m 644 *.png $RPM_BUILD_ROOT/var/www/usage
-install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/00webalizer
+install -p -m 644 *.png $RPM_BUILD_ROOT%{_localstatedir}/www/usage
+install -p -m 755 $RPM_SOURCE_DIR/webalizer.cron \
+         $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/00webalizer
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 install -p -m 644 $RPM_SOURCE_DIR/webalizer-httpd.conf \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webalizer.conf
@@ -91,21 +92,25 @@
 
 %pre
 /usr/sbin/adduser -c "Webalizer" -u 67 \
-	-s /sbin/nologin -r -d /var/www/usage webalizer 2>/dev/null || :
+    -s /sbin/nologin -r -d %{_localstatedir}/www/usage webalizer 2>/dev/null || :
 
 %files
 %defattr(-,root,root)
 %doc README
 %{_mandir}/man1/webalizer.1*
 %{_bindir}/*
-%config %{_sysconfdir}/webalizer.conf
-%config(noreplace) %{_sysconfdir}/cron.daily/00webalizer
+%config(noreplace) %{_sysconfdir}/webalizer.conf
+%{_sysconfdir}/cron.daily/00webalizer
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/webalizer.conf
-%attr(-, webalizer, root) %dir /var/www/usage
-%attr(-, webalizer, root) %dir /var/lib/webalizer
-%attr(-, webalizer, root) /var/www/usage/*.png
+%attr(-, webalizer, root) %dir %{_localstatedir}/www/usage
+%attr(-, webalizer, root) %dir %{_localstatedir}/lib/webalizer
+%attr(-, webalizer, root) %{_localstatedir}/www/usage/*.png
 
 %changelog
+* Thu Feb  7 2008 Joe Orton <jorton at redhat.com> 2.01_10-35
+- use %%{_localestatedir}, remove tabs, require httpd not
+  webserver, mark webalizer.conf config(noreplace) (#226536)
+
 * Thu Aug 30 2007 Joe Orton <jorton at redhat.com> 2.01_10-34
 - clarify License tag