rpms/webalizer/devel webalizer.spec,1.27,1.28

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/webalizer/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6342

Modified Files:
	webalizer.spec 
Log Message:
* Mon Mar 19 2007 Joe Orton <jorton at redhat.com> 2.01_10-32
- spec file cleanups (#226536):
 * convert to UTF-8
 * fix BuildRoot, Summary
 * add Requires(pre) for shadow-utils, remove Prereqs
 * trim BuildRequires to png-devel, db4-devel
 * use smp_mflags in make
 * use sysconfdir macro throughout
 * preserve file timestamps on installation



Index: webalizer.spec
===================================================================
RCS file: /cvs/dist/rpms/webalizer/devel/webalizer.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- webalizer.spec	29 Jan 2007 11:22:23 -0000	1.27
+++ webalizer.spec	19 Mar 2007 10:16:15 -0000	1.28
@@ -2,20 +2,17 @@
 %define patchlevel 10
 
 Name: webalizer
-Summary: A flexible Web server log file analysis program.
+Summary: A flexible Web server log file analysis program
 Group: Applications/Internet
-Version: %{ver}_%{patchlevel}
-Release: 31
+Version: 2.01_10
+Release: 32
 URL: http://www.mrunix.net/webalizer/
 License: GPL
-Buildroot: %{_tmppath}/%{name}-root
-
 Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlevel}-src.tar.bz2
 Source1: webalizer.conf
 Source2: webalizer.cron
 Source3: webalizer-httpd.conf
-
-Patch0:  webalizer-2.01-06-rh.patch
+Patch0: webalizer-2.01-06-rh.patch
 Patch1: dns-db1.patch
 Patch2: webalizer-2.01_10-lfs.patch
 Patch3: webalizer-2.01-10-overflow.patch
@@ -31,15 +28,9 @@
 Patch13: webalizer-2.01-10-agent-apple.patch
 Patch14: webalizer-2.01-10-agent-compatible.patch
 Patch15: webalizer-2.01-10-agent-default.patch
-
-BuildPrereq: gd-devel
-BuildPrereq: zlib-devel
-BuildPrereq: libpng-devel
-BuildPrereq: db4-devel
-
-Prereq: shadow-utils
-Prereq: fileutils
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gd-devel, db4-devel
+Requires(pre): /usr/sbin/useradd
 Requires: webserver, crontabs
 
 %description
@@ -73,7 +64,7 @@
 CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS -D_LARGEFILE64_SOURCE" ; export CFLAGS
 %configure --enable-dns --with-dblib=/lib
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -81,19 +72,19 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir} \
          $RPM_BUILD_ROOT/%{_mandir}/man1 \
          $RPM_BUILD_ROOT/var/www/usage \
-         $RPM_BUILD_ROOT/etc/cron.daily
+         $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/webalizer
 
 %makeinstall
-install -m 644 $RPM_SOURCE_DIR/webalizer.conf $RPM_BUILD_ROOT/etc
-install -m 644 *.png $RPM_BUILD_ROOT/var/www/usage
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/00webalizer
+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
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/webalizer-httpd.conf \
+install -p -m 644 $RPM_SOURCE_DIR/webalizer-httpd.conf \
         $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webalizer.conf
 
-rm -f $RPM_BUILD_ROOT/etc/webalizer.conf.sample
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/webalizer.conf.sample
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,14 +98,24 @@
 %doc README
 %{_mandir}/man1/webalizer.1*
 %{_bindir}/*
-%config /etc/webalizer.conf
-%config(noreplace) /etc/cron.daily/00webalizer
-%config(noreplace) /etc/httpd/conf.d/webalizer.conf
+%config %{_sysconfdir}/webalizer.conf
+%config(noreplace) %{_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
 
 %changelog
+* Mon Mar 19 2007 Joe Orton <jorton at redhat.com> 2.01_10-32
+- spec file cleanups (#226536):
+ * convert to UTF-8
+ * fix BuildRoot, Summary
+ * add Requires(pre) for shadow-utils, remove Prereqs
+ * trim BuildRequires to png-devel, db4-devel
+ * use smp_mflags in make
+ * use sysconfdir macro throughout
+ * preserve file timestamps on installation
+
 * Mon Jan 29 2007 Joe Orton <jorton at redhat.com> 2.01_10-31
 - rebuild to pick up new db4 soname
 
@@ -264,7 +265,7 @@
 * Sun Sep 16 2001 Than Ngo <than at redhat.com> 2.01_06-12
 - add patch from author to fix Webalizer dumps core when MangleAgents is set to 1
 
-* Mon Jul 16 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jul 16 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - Remove empty post
 - Mark the crontab file as config(noreplace) 
 
@@ -312,7 +313,7 @@
 - changed graph output to png instead of gif
 - changed path to apache root (/var/www)
 
-* Mon Nov 08 1999 Bernhard Rosenkränzer <bero at redhat.com>
+* Mon Nov 08 1999 Bernhard Rosenkränzer <bero at redhat.com>
 - handle RPM_OPT_FLAGS
 
 * Tue Sep 28 1999 Preston Brown <pbrown at redhat.com>