--- shorewall-4.0.4.spec	2007-10-08 23:48:57.000000000 +0100
+++ shorewall.spec	2007-10-27 22:50:42.000000000 +0100
@@ -1,6 +1,9 @@
+# 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:	4.0.4
-Release:	2%{?dist}
+Version:	4.0.5
+Release:	1%{?dist}
 Summary:	An iptables front end for firewall configuration
 
 Group:		Applications/System
@@ -13,7 +16,7 @@
 Patch0: 	shorewall-4.0.4-init.patch
 Patch1: 	shorewall-lite-4.0.4-init.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	perl setup 
+BuildRequires:	perl
 BuildArch:	noarch
 Requires:	shorewall-common = %{version}-%{release}
 Requires:	shorewall-perl = %{version}-%{release}
@@ -66,10 +69,9 @@
 %description lite
 Shorewall Lite is a companion product to Shorewall that allows network
 administrators to centralize the configuration of Shorewall-based
-firewalls. Shorewall Lite runs a firewall script generated by a machine with a
-Shorewall rule compiler. A machine running Shorewall Lite does not need to have
-a Shorewall rule compiler installed.
-
+firewalls. Shorewall Lite runs a firewall script generated by a
+machine with a Shorewall rule compiler. A machine running Shorewall
+Lite does not need to have a Shorewall rule compiler installed.
 
 %prep
 %setup -q -c -n shorewall-%{version}
@@ -77,8 +79,13 @@
 %setup -q -T -D -a 2
 %setup -q -T -D -a 3
 
-%patch0 -p0
-%patch1 -p0
+pushd shorewall-common-%{version}
+%patch0 -p1
+popd
+
+pushd shorewall-lite-%{version}
+%patch1 -p1
+popd
 
 # Remove hash-bang from files which are not directly executed as shell
 # scripts. This silences some rpmlint errors.
@@ -106,10 +113,6 @@
 ./install.sh -n
 popd
 
-# Remove FallbackPorts.pm to prevent conflicting Provides for
-# Shorewall::Ports from both Fallbackport.ps and Ports.pm
-rm -f $RPM_BUILD_ROOT%{_datadir}/shorewall-perl/Shorewall/FallbackPorts.pm
-
 #### Build shorewall-shell
 pushd shorewall-shell-%{version}
 ./install.sh -n
@@ -211,7 +214,6 @@
 %doc shorewall-perl-%{version}/{COPYING,releasenotes.txt}
 %dir %{_datadir}/shorewall-perl
 %dir %{_datadir}/shorewall-perl/Shorewall
-%attr(755,root,root) %{_datadir}/shorewall-perl/buildports.pl
 %attr(755,root,root) %{_datadir}/shorewall-perl/compiler.pl
 %{_datadir}/shorewall-perl/prog.*
 %{_datadir}/shorewall-perl/version
@@ -248,6 +250,9 @@
 %{_mandir}/man8/shorewall-lite.8.gz
 
 %changelog
+* Sat Oct 27 2007 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 4.0.5-1
+- Update to 4.0.5 which removes the need for the buildports.pl functionality
+
 * Mon Oct  8 2007 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 4.0.4-2
 - Add ghost files for /var/lib/shorewall/.modules and /var/lib/shorewall/.modulesdir
 - Fix ownership of /var/lib/shorewall-lite