[shorewall] - Update to 4.5.2.4 - Use BR perl(Digest::SHA) - Drop install patch fixed upstream - Drop setting un

[Orion Poplawski]

commit 4d13cb23623115a55f3f5205415d38cfcc556f2b
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed May 2 21:55:26 2012 -0600

    - Update to 4.5.2.4
    - Use BR perl(Digest::SHA)
    - Drop install patch fixed upstream
    - Drop setting unneeded install variables
    - Use %{perl_vendorlib}

 .gitignore              |    6 ++++++
 shorewall-install.patch |   14 --------------
 shorewall.spec          |   28 ++++++++++------------------
 sources                 |   12 ++++++------
 4 files changed, 22 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 03794e5..75b4e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,9 @@ shorewall-lite-4.4.11.1.tar.bz2
 /shorewall-core-4.5.2.tar.bz2
 /shorewall-init-4.5.2.tar.bz2
 /shorewall-lite-4.5.2.tar.bz2
+/shorewall-4.5.2.4.tar.bz2
+/shorewall6-4.5.2.4.tar.bz2
+/shorewall6-lite-4.5.2.4.tar.bz2
+/shorewall-core-4.5.2.4.tar.bz2
+/shorewall-init-4.5.2.4.tar.bz2
+/shorewall-lite-4.5.2.4.tar.bz2
diff --git a/shorewall.spec b/shorewall.spec
index ba16eff..ff08be4 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -6,7 +6,7 @@
 # which is found at http://www.shorewall.net/Anatomy.html
 
 Name:           shorewall
-Version:        %{mainver}
+Version:        %{mainver}.4
 Release:        1%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
@@ -20,10 +20,9 @@ Source2:        %{baseurl}/%{name}6-%{version}.tar.bz2
 Source3:        %{baseurl}/%{name}6-lite-%{version}.tar.bz2
 Source4:        %{baseurl}/%{name}-init-%{version}.tar.bz2
 Source5:        %{baseurl}/%{name}-core-%{version}.tar.bz2
-Patch0:         shorewall-install.patch
 
 BuildRequires:  perl
-BuildRequires:  perl(Digest::SHA1)
+BuildRequires:  perl(Digest::SHA)
 BuildRequires:  systemd-units
 
 BuildArch:      noarch
@@ -131,13 +130,6 @@ for 'event-driven' startup and shutdown.
 
 %prep
 %setup -q -c -n %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5
-targets="shorewall-core shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init"
-for i in $targets; do
-    pushd ${i}-%{version}
-%patch0 -p0 -b .install
-    popd
-done
-
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
@@ -145,15 +137,8 @@ find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 %build
 
 %install
-export PREFIX=$RPM_BUILD_ROOT
-export DEST=%{_initrddir}
-export LIBEXEC=%{_libexecdir}
-export PERLLIB=%{perl_privlib}
-
 targets="shorewall-core shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init"
 
-install -d $RPM_BUILD_ROOT%{_unitdir}
-
 for i in $targets; do
     pushd ${i}-%{version}
     ./configure vendor=redhat SYSTEMD=%{_unitdir} SBINDIR=%{_sbindir}
@@ -334,7 +319,7 @@ fi
 %{_datadir}/shorewall/version
 %{_libexecdir}/shorewall/compiler.pl
 %{_libexecdir}/shorewall/getparams
-%{perl_privlib}/Shorewall
+%{perl_vendorlib}/Shorewall
 %{_mandir}/man5/shorewall*
 %exclude %{_mandir}/man5/shorewall6*
 %exclude %{_mandir}/man5/shorewall-lite*
@@ -413,6 +398,13 @@ fi
 %{_unitdir}/shorewall-init.service
 
 %changelog
+* Wed May 2 2012 Orion Poplawski <orion at cora.nwra.com> - 4.5.2.4-1
+- Update to 4.5.2.4
+- Use BR perl(Digest::SHA)
+- Drop install patch fixed upstream
+- Drop setting unneeded install variables
+- Use %%{perl_vendorlib}
+
 * Wed Apr 11 2012 Orion Poplawski <orion at cora.nwra.com> - 4.5.2-1
 - Update to 4.5.2
 - Add patch to fixup install locations
diff --git a/sources b/sources
index e03704e..d7bbc3a 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-0815c01abbdfadd333d5553775d44496  shorewall-4.5.2.tar.bz2
-15b232f109a5e7834c232539623618ab  shorewall6-4.5.2.tar.bz2
-59eebef2cd02c046dbfe4f5c78d66745  shorewall6-lite-4.5.2.tar.bz2
-e6e050428f1da64090490d9f983d4ad1  shorewall-core-4.5.2.tar.bz2
-4f850f3bdb8e28232b9e1d8bc7ebf5de  shorewall-init-4.5.2.tar.bz2
-d07693e5b5072280abb85944999fdfac  shorewall-lite-4.5.2.tar.bz2
+7e42381f8fd02985b797f0b4b4fda4b7  shorewall-4.5.2.4.tar.bz2
+be4caca86546e741294da5e105807daf  shorewall6-4.5.2.4.tar.bz2
+33ee52cd26f1173a0c30aaaff12ef209  shorewall6-lite-4.5.2.4.tar.bz2
+1d791668feba4004bb94b2e7a0126fc6  shorewall-core-4.5.2.4.tar.bz2
+5195d81d609992318b369d9f96b26fd9  shorewall-init-4.5.2.4.tar.bz2
+7c4c5ec5f00b35cac00241232d5b1610  shorewall-lite-4.5.2.4.tar.bz2