- drop logrotate for no longer used /var/log/shorewall

diff --git a/shorewall.logrotate b/shorewall.logrotate
deleted file mode 100644 (file)
index 8beea64..0000000
--- a/shorewall.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/shorewall {
-  missingok
-  notifempty
-  create 0600 root root
-}

diff --git a/shorewall.spec b/shorewall.spec
index 34ce646843624dc6c5edd5f5ae6ac599e866d12b..693b5f94a8459dcf377e62ea389cc717813575df 100644 (file)
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -9,7 +9,7 @@ Summary:        Shoreline Firewall - an iptables-based firewall for Linux systems
 Summary(pl.UTF-8):     Shoreline Firewall - zapora sieciowa oparta na iptables
 Name:          shorewall
 Version:       %{ver}%{rel}
 Summary(pl.UTF-8):     Shoreline Firewall - zapora sieciowa oparta na iptables
 Name:          shorewall
 Version:       %{ver}%{rel}

-Release:       3
+Release:       4

 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-%{version}.tar.bz2
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-%{version}.tar.bz2


@@ -25,7 +25,6 @@ Source4:      http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-ini
 Source5:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-core-%{version}.tar.bz2
 # Source5-md5: 07c7371fd2896e87f373b760561e41a8
 Source10:      %{name}.init
 Source5:       http://www.shorewall.net/pub/shorewall/5.2/shorewall-%{ver}/%{name}-core-%{version}.tar.bz2
 # Source5-md5: 07c7371fd2896e87f373b760561e41a8
 Source10:      %{name}.init

-Source11:      %{name}.logrotate

 Patch0:                %{name}-config.patch
 Patch1:                %{name}-logging.patch
 Patch2:                tld.patch
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-logging.patch
 Patch2:                tld.patch


@@ -145,13 +144,13 @@ for i in $targets; do
        cp -p $i/shorewallrc.{redhat,tld}
        %{__sed} -i -r -e 's!RedHat/Fedora!TLD !; s/^HOST\=redhat/HOST\=tld/; /^(SERVICEDIR|SERVICEFILE)/d;' $i/shorewallrc.tld
 done
        cp -p $i/shorewallrc.{redhat,tld}
        %{__sed} -i -r -e 's!RedHat/Fedora!TLD !; s/^HOST\=redhat/HOST\=tld/; /^(SERVICEDIR|SERVICEFILE)/d;' $i/shorewallrc.tld
 done

-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1

 
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
 
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.


@@ -175,7 +174,6 @@ done
 
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/shorewall
 
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/shorewall

-install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/shorewall

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -268,7 +266,6 @@ fi
 %files core
 %defattr(644,root,root,755)
 %doc shorewall-core/{COPYING,changelog.txt,releasenotes.txt}
 %files core
 %defattr(644,root,root,755)
 %doc shorewall-core/{COPYING,changelog.txt,releasenotes.txt}

-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/shorewall

 %dir %{_datadir}/shorewall/
 %{_datadir}/shorewall/coreversion
 %{_datadir}/shorewall/functions
 %dir %{_datadir}/shorewall/
 %{_datadir}/shorewall/coreversion
 %{_datadir}/shorewall/functions