rpms/rkhunter/devel rkhunter.spec,1.11,1.12

[Kevin Fenzi (kevin)]

Author: kevin

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

Modified Files:
	rkhunter.spec 
Log Message:
Use /etc/redhat-release for EPEL and /etc/fedora release for Fedora.
Add conditionals to support EPEL
Fix man page warning.



Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rkhunter.spec	15 Feb 2008 04:30:23 -0000	1.11
+++ rkhunter.spec	28 Feb 2008 22:00:43 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -32,9 +32,13 @@
 	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
 	s|^#(SCRIPTDIR=).+$|$1%{_datadir}/%{name}/scripts|;
 	s|^#(PKGMGR=).+$|$1RPM|;
+%if 0%{?el4}%{?el5}
+	s|^#(OS_VERSION_FILE=).+$|$1/etc/redhat-release|;
+%else
 	s|^#(OS_VERSION_FILE=).+$|$1/etc/fedora-release|;
+%endif
 	s|^#(ALLOWHIDDENDIR=).+$|$1/dev/.udev|;
-	s|^#(ALLOWHIDDENDIR=).+$|$1/usr/share/man/man1/..1.gz|;
+	s|^#(ALLOWHIDDENFILE=).+$|$1/usr/share/man/man1/..1.gz|;
 	s|^(APPEND_LOG=).+$|$11|;
 	s|^(ALLOW_SSH_ROOT_USER=).+$|$1yes|;
 	s|^(DISABLE_TESTS=).+$|$1"additional_rkts suspscan hidden_procs deleted_files packet_cap_apps"|;
@@ -49,7 +53,11 @@
 echo "SCRIPTWHITELIST=/sbin/ifup" >> files/%name.conf
 echo "SCRIPTWHITELIST=/sbin/ifdown" >> files/%name.conf
 # in f8/f9
+%if 0%{?fc8}%{?fc9}
 echo "SYSLOG_CONFIG_FILE=/etc/rsyslog.conf" >> files/%name.conf
+%else
+echo "SYSLOG_CONFIG_FILE=/etc/syslog.conf" >> files/%name.conf
+%endif
 
 %{__perl} -pi.orig -e '
 	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
@@ -134,6 +142,11 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Feb 28 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.0-2
+- Use /etc/redhat-release for EPEL and /etc/fedora release for Fedora.
+- Add conditionals to support EPEL
+- Fix man page warning. 
+
 * Sun Feb 03 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.0-1
 - Revive package, clean up spec
 - Update to 1.3.0