[shorewall] Update to 4.4.25.2 Drop service patches applied upstream

[Orion Poplawski]

commit 7afd31eb458a620b32c9a31c53cad7f578120562
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Nov 7 16:23:01 2011 -0700

    Update to 4.4.25.2
    Drop service patches applied upstream

 .gitignore                             |    5 +++++
 shorewall-4.4.23.3-service.patch       |   19 -------------------
 shorewall-init-4.4.23.3-service.patch  |   11 -----------
 shorewall-lite-4.4.23.3-service.patch  |   11 -----------
 shorewall.spec                         |   22 +++++++---------------
 shorewall6-4.4.23.3-service.patch      |   11 -----------
 shorewall6-lite-4.4.23.3-service.patch |   11 -----------
 sources                                |   10 +++++-----
 8 files changed, 17 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0cb62df..183c570 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,8 @@ shorewall-lite-4.4.11.1.tar.bz2
 /shorewall6-lite-4.4.23.3.tar.bz2
 /shorewall-init-4.4.23.3.tar.bz2
 /shorewall-lite-4.4.23.3.tar.bz2
+/shorewall-4.4.25.2.tar.bz2
+/shorewall6-4.4.25.2.tar.bz2
+/shorewall6-lite-4.4.25.2.tar.bz2
+/shorewall-init-4.4.25.2.tar.bz2
+/shorewall-lite-4.4.25.2.tar.bz2
diff --git a/shorewall.spec b/shorewall.spec
index f5b6a83..98e073f 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -1,12 +1,12 @@
-%global mainver 4.4.23
+%global mainver 4.4.25
 %global baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/
 
 # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
 # which is found at http://www.shorewall.net/Anatomy.html
 
 Name:           shorewall
-Version:        %{mainver}.3
-Release:        6%{?dist}
+Version:        %{mainver}.2
+Release:        1%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -19,12 +19,6 @@ Source2:        %{baseurl}/%{name}6-%{version}.tar.bz2
 Source3:        %{baseurl}/%{name}6-lite-%{version}.tar.bz2
 Source4:        %{baseurl}/%{name}-init-%{version}.tar.bz2
 
-Patch0:		shorewall-4.4.23.3-service.patch
-Patch1:		shorewall-lite-4.4.23.3-service.patch
-Patch2:		shorewall6-4.4.23.3-service.patch
-Patch3:		shorewall6-lite-4.4.23.3-service.patch
-Patch4:		shorewall-init-4.4.23.3-service.patch
-
 BuildRequires:  perl
 BuildRequires: 	systemd-units
 
@@ -128,12 +122,6 @@ for 'event-driven' startup and shutdown.
 # scripts. This silences some rpmlint errors.
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-
 %build
 
 %install
@@ -382,6 +370,10 @@ fi
 %attr(0755,root,root) %{_libexecdir}/shorewall-init
 
 %changelog
+* Mon Nov 7 2011 Orion Poplawski <orion at cora.nwra.com> - 4.4.25.2-1
+- Update to 4.4.25.2
+- Drop service patches applied upstream
+
 * Mon Oct 10 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.23.3-6
 - Remove ExecReload from all service files 
 - Add After=network.target to shorewall.service
diff --git a/sources b/sources
index 017c6b0..9b6f183 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-3d39174c71308739db234dcceead8b71  shorewall-4.4.23.3.tar.bz2
-4803c2e9b56f1e662dbfba4ecb4665b1  shorewall6-4.4.23.3.tar.bz2
-fb01610a959508b3cf8cadf595b05a19  shorewall6-lite-4.4.23.3.tar.bz2
-5ab6eb0a034da55d487040c51062b918  shorewall-init-4.4.23.3.tar.bz2
-49f468e1cbdba69d8f6a8d93eee4a9d4  shorewall-lite-4.4.23.3.tar.bz2
+885ebc5dc1819a46e4f839e4c0f83241  shorewall-4.4.25.2.tar.bz2
+80a51a6cd6535e3bdfd20d6ee7653cdf  shorewall6-4.4.25.2.tar.bz2
+771d91c79f136b1012b77d5eb258f4f1  shorewall6-lite-4.4.25.2.tar.bz2
+33311cde253a728be6f29c9d572f262c  shorewall-init-4.4.25.2.tar.bz2
+4f58ac2a6f3f87fa3c0d098c3a1cefb1  shorewall-lite-4.4.25.2.tar.bz2