rpms/shorewall/F-10 shorewall.spec,1.79,1.80 sources,1.55,1.56

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/shorewall/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16584

Modified Files:
	shorewall.spec sources 
Log Message:
* Wed Jul  8 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.10-1
- Update to version 4.2.10
- Update shorewall-perl to 4.2.10.3



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- shorewall.spec	27 May 2009 21:28:38 -0000	1.79
+++ shorewall.spec	7 Jul 2009 23:12:42 -0000	1.80
@@ -1,9 +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
 
-%global major_ver 4.2.9
+%global major_ver 4.2.10
 %global common_ver %{major_ver}
-%global perl_ver %{major_ver}
+%global perl_ver %{major_ver}.3
 %global lite_ver %{major_ver}
 %global shell_ver %{major_ver}
 %global shorewall6_ver %{major_ver}
@@ -11,13 +11,13 @@
 
 Name:           shorewall
 Version:        %{major_ver}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.shorewall.net/
 
-%global _baseurl http://www.shorewall.net/pub/shorewall/4.2/shorewall-%{version}
+%global _baseurl http://www.shorewall.net/pub/shorewall/4.2/shorewall-%{version}/
 Source0:        %{_baseurl}/%{name}-common-%{common_ver}.tar.bz2
 Source1:        %{_baseurl}/%{name}-perl-%{perl_ver}.tar.bz2
 Source2:        %{_baseurl}/%{name}-shell-%{shell_ver}.tar.bz2
@@ -34,7 +34,6 @@ BuildArch:      noarch
 
 Requires:       shorewall-common = %{common_ver}-%{release}
 Requires:       shorewall-perl = %{perl_ver}-%{release}
-Requires:       shorewall-shell = %{shell_ver}-%{release}
 
 %description
 The Shoreline Firewall, more commonly known as "Shorewall", is a
@@ -148,6 +147,9 @@ sed -i -e 's|prog="shorewall"|prog="shor
 # scripts. This silences some rpmlint errors.
 find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 
+# Make the perl compiler the default
+sed -i -e 's|SHOREWALL_COMPILER=|SHOREWALL_COMPILER=perl|' shorewall-common-%{common_ver}/shorewall.conf
+
 %build
 
 %install
@@ -405,7 +407,15 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
-* Wed May 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.9-2
+* Wed Jul  8 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.10-1
+- Update to version 4.2.10
+- Update shorewall-perl to 4.2.10.3
+
+* Thu Jun 12 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.9-3
+- Change init files to start as number 28 (previously 25) to ensure starting
+  after NetworkManager (BZ 505444)
+
+* Wed May 27 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.9-2
 - Fix up /var/lib directories (BZ 502929)
 
 * Wed May 20 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.9-1
@@ -416,11 +426,18 @@ fi
 - Update shorewall-perl to 4.2.8.2
 - Use global instead of define in macros to comply with packaging guidelines
 
-* Mon Apr 13 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-3
+* Mon Apr 13 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-5
 - Update shorewall-perl to version 4.2.7.3
 
-* Fri Apr  6 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-2
-- Update shorewall-perl to 4.2.7.1 (BZ 493984)
+* Fri Apr  3 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-4
+- Update shorewall-perl to version 4.2.7.1 (BZ 493984)
+
+* Thu Mar 26 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-3
+- Really make the perl compiler default
+
+* Tue Mar 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-2
+- Make the perl compiler the default. Drop shorewall-shell requirement from
+  shorewall package
 
 * Tue Mar 24 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.7-1
 - Update to version 4.2.7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- sources	20 May 2009 22:11:17 -0000	1.55
+++ sources	7 Jul 2009 23:12:43 -0000	1.56
@@ -1,6 +1,6 @@
-b2563b635d15824303449d8c30adf381  shorewall6-4.2.9.tar.bz2
-50efc79d52e7ef2e93fcbe1303c2af56  shorewall6-lite-4.2.9.tar.bz2
-6cdb50e7d3caadfc1046acb050ae1deb  shorewall-common-4.2.9.tar.bz2
-59ca1b403a8752bcaae5d245ae35210c  shorewall-lite-4.2.9.tar.bz2
-d2df02807b023526f58cb41ece36f610  shorewall-perl-4.2.9.tar.bz2
-caa96cf4c257a7156f1621a1ac41d69c  shorewall-shell-4.2.9.tar.bz2
+9451ee3fffece868cba041e7c74fc8ef  shorewall6-4.2.10.tar.bz2
+059b349fb46145c6eba6f3c3ecf1ae52  shorewall6-lite-4.2.10.tar.bz2
+49bdbbae8dec65154c4e5538ed3c9865  shorewall-common-4.2.10.tar.bz2
+ef5958819ba18801bacfe20e67184f2a  shorewall-lite-4.2.10.tar.bz2
+f19bed40fe28a905fd08482b9dc5f7ce  shorewall-perl-4.2.10.3.tar.bz2
+d6f7cbc3c502c09921ede920547d5017  shorewall-shell-4.2.10.tar.bz2