From 7c7b5910441faacc2bbba9020d05b4b23c40d55a Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Thu, 8 Feb 2007 15:04:40 +0000
Subject: [PATCH] - incorporate package review feedback - Resolves: 227814
 logwatch warns about ntpd deletes interfaces on shutdown

---
 logwatch.spec | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/logwatch.spec b/logwatch.spec
index 9b33e66..3fcf999 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -15,9 +15,10 @@ Patch6: logwatch-7.3.2-automount.patch
 Patch7: logwatch-7.3.2-amavis.patch
 Patch8: logwatch-7.3.2-cron.patch
 Patch9: logwatch-7.3.2-audit.patch
+Patch10: logwatch-7.3.2-iptables.patch
 
 Requires: textutils sh-utils grep mailx
-BuildRoot: %{_tmppath}/logwatch-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
 %description
@@ -37,9 +38,14 @@ of the package on many systems.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+# GPL license
+rm ./scripts/services/courier
+rm ./scripts/services/dpkg
+
+%build
 
 %install
-
 rm -rf %{buildroot}
 
 install -m 0755 -d %{buildroot}%{_var}/cache/logwatch
@@ -60,13 +66,13 @@ install -m 0755 -d %{buildroot}%{_datadir}/logwatch/lib
 for i in scripts/logfiles/*; do
     if [ $(ls $i | wc -l) -ne 0 ]; then
         install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i
-        install -m 0755 $i/* %{buildroot}%{_datadir}/logwatch/$i
+        install -m 0644 $i/* %{buildroot}%{_datadir}/logwatch/$i
     fi
 done
 
 install -m 0755 scripts/logwatch.pl %{buildroot}%{_datadir}/logwatch/scripts/logwatch.pl
-install -m 0755 scripts/services/* %{buildroot}%{_datadir}/logwatch/scripts/services
-install -m 0755 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared
+install -m 0644 scripts/services/* %{buildroot}%{_datadir}/logwatch/scripts/services
+install -m 0644 scripts/shared/* %{buildroot}%{_datadir}/logwatch/scripts/shared
 
 install -m 0644 conf/logwatch.conf %{buildroot}%{_datadir}/logwatch/default.conf/logwatch.conf
 install -m 0644 conf/logfiles/* %{buildroot}%{_datadir}/logwatch/default.conf/logfiles
@@ -84,7 +90,11 @@ rm -f  %{buildroot}%{_sysconfdir}/cron.daily/logwatch \
   %{buildroot}%{_datadir}/logwatch/conf/services/zz-fortune* \
  %{buildroot}%{_datadir}/logwatch/conf/logfiles/fortune*
 touch %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
-chmod 755 %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
+touch %{buildroot}%{_datadir}/logwatch/scripts/services/courier
+touch %{buildroot}%{_datadir}/logwatch/scripts/services/dpkg
+chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/zz-fortune
+chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/courier
+chmod 644 %{buildroot}%{_datadir}/logwatch/scripts/services/dpkg
 
 install -m 0755 -d %{buildroot}%{_sysconfdir}/cron.daily
 ln -s %{_datadir}/logwatch/scripts/logwatch.pl %{buildroot}%{_sysconfdir}/cron.daily/0logwatch
@@ -104,7 +114,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc README HOWTO-Customize-LogWatch 
+%doc README HOWTO-Customize-LogWatch
 %dir %{_var}/cache/logwatch
 %dir %{_sysconfdir}/logwatch
 %dir %{_sysconfdir}/logwatch/conf
@@ -142,9 +152,14 @@ rm -rf %{buildroot}
 %{_sysconfdir}/cron.daily/0logwatch
 %doc %{_mandir}/man8/logwatch.8*
 
-%doc License project/CHANGES project/TODO
+%doc License project/CHANGES 
 
 %changelog
+* Thu Feb  8 2007 Ivana Varekova <vraekova@redhat.com> 7.3.2-7
+- incorporate package review feedback
+- Resolves: 227814
+  logwatch warns about ntpd deletes interfaces on shutdown
+
 * Mon Feb  5 2007 Ivana Varekova <varekova@redhat.com> 7.3.2-6
 - Resolves: 226999
   fix audit script