rpms/shorewall/devel shorewall.spec, 1.44, 1.45 patch-perl-4.0.6-1.diff, 1.1, NONE patch-perl-4.0.6-2.diff, 1.1, NONE patch-perl-4.0.6-3.diff, 1.1, NONE

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4632

Modified Files:
	shorewall.spec 
Removed Files:
	patch-perl-4.0.6-1.diff patch-perl-4.0.6-2.diff 
	patch-perl-4.0.6-3.diff 
Log Message:
* Sun Jan  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.7-2
- Remove 4.0.7.1 patch as it seems that's already been applied to the tarball
  contents



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- shorewall.spec	6 Jan 2008 18:19:07 -0000	1.44
+++ shorewall.spec	6 Jan 2008 18:55:03 -0000	1.45
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:	4.0.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An iptables front end for firewall configuration
 Group:		Applications/System
 License:	GPLv2+
@@ -24,8 +24,7 @@
 Source3: 	%{_baseurl}%{name}-lite-%{version}.tar.bz2
 Patch0: 	shorewall-4.0.4-init.patch
 Patch1: 	shorewall-lite-4.0.4-init.patch
-Patch2:		patch-perl-4.0.7.1
-Patch3:		patch-perl-4.0.7.2-cherrypick
+Patch2:		patch-perl-4.0.7.2-cherrypick
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	perl
@@ -104,7 +103,6 @@
 
 pushd shorewall-perl-%{version}
 %patch2 -p1
-%patch3 -p1
 popd
 
 # Remove hash-bang from files which are not directly executed as shell
@@ -271,6 +269,10 @@
 
 %changelog
 * Sun Jan  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.7-2
+- Remove 4.0.7.1 patch as it seems that's already been applied to the tarball
+  contents
+
+* Sun Jan  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.7-2
 - Fix error in patching commands in spec file (change -p0 to -p1 for new patches)
 
 * Sun Jan  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.0.7-1


--- patch-perl-4.0.6-1.diff DELETED ---


--- patch-perl-4.0.6-2.diff DELETED ---


--- patch-perl-4.0.6-3.diff DELETED ---