diff --git a/shorewall.spec b/shorewall.spec index 5d3ded5..f7bd4f5 100644 --- a/shorewall.spec +++ b/shorewall.spec @@ -2,7 +2,7 @@ %define maj3ver %(echo %version | cut -d. -f1-3) Name: shorewall Version: 4.6.1 -Release: 1mamba +Release: 2mamba Summary: Shoreline Firewall, a high-level tool for configuring Netfilter Group: Network/Security Vendor: openmamba @@ -20,6 +20,10 @@ Source6: http://slovakia.shorewall.net/pub/shorewall/%{majver}/shorewall- #Source9: http://slovakia.shorewall.net/pub/shorewall/%{majver}/shorewall-%{version}/base/shorewall-shell-%{version}.tar.bz2 License: GPL BuildArch: noarch +## AUTOBUILDREQ-BEGIN +BuildRequires: libperl +BuildRequires: perl-devel +## AUTOBUILDREQ-END BuildRequires: shorewall-core >= %{version} Requires: shorewall-core >= %{version} Requires: iptables @@ -37,7 +41,7 @@ The Shoreline Firewall, more commonly known as "Shorewall", is a high-level tool --prefix=%{_prefix} \ --mandir=%{_mandir} \ --sysconfdir=%{_sysconfdir} \ - --initdir=%{_initrddir} \ + --systemd=%{_unitdir} \ HOST=linux %install @@ -50,16 +54,31 @@ install %{SOURCE3} %{buildroot}%{_sysconfdir}/shorewall/policy install %{SOURCE4} %{buildroot}%{_sysconfdir}/shorewall/rules install %{SOURCE5} %{buildroot}%{_sysconfdir}/shorewall/zones +rm -f %{buildroot}%{_sysconfdir}/init.d/shorewall + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%post +if [ $1 -ge 1 ]; then + systemctl -q daemon-reload + systemctl -q reload-or-try-restart shorewall +fi +: + +%preun +if [ $1 -eq 0 ]; then + systemctl -q stop shorewall +fi +: + %files %defattr(-,root,root) %dir %{_sysconfdir}/shorewall %config(noreplace) %{_sysconfdir}/shorewall/* -%{_initrddir}/shorewall %{_sysconfdir}/logrotate.d/shorewall /sbin/shorewall +%{_unitdir}/shorewall.service %dir %{_datadir}/shorewall %{_datadir}/shorewall/* %{_mandir}/man5/shorewall*.5* @@ -69,6 +88,9 @@ install %{SOURCE5} %{buildroot}%{_sysconfdir}/shorewall/zones #README.txt %changelog +* Tue Jun 10 2014 Silvan Calarco 4.6.1-2mamba +- rebuilt with systemd support + * Mon Jun 09 2014 Automatic Build System 4.6.1-1mamba - automatic version update by autodist