rpms/shorewall/F-10 shorewall.spec,1.80,1.81

[Jonathan G. Underwood]

Author: jgu

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

Modified Files:
	shorewall.spec 
Log Message:
* Wed Jul  8 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.10-1.1
- Revert the accidental changes to spec file which made the perl compiler the
  default



Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/F-10/shorewall.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- shorewall.spec	7 Jul 2009 23:12:42 -0000	1.80
+++ shorewall.spec	8 Jul 2009 14:10:59 -0000	1.81
@@ -11,7 +11,7 @@
 
 Name:           shorewall
 Version:        %{major_ver}
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -34,6 +34,7 @@ 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
@@ -147,9 +148,6 @@ 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
@@ -407,6 +405,10 @@ fi
 %attr(0755,root,root) %{_datadir}/shorewall6-lite/wait4ifup
 
 %changelog
+* Wed Jul  8 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.2.10-1.1
+- Revert the accidental changes to spec file which made the perl compiler the
+  default
+
 * 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