From 438f25c1bddbfb07198f6b2843125dffcda3100b Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 12 Dec 2007 19:18:43 +0000
Subject: [PATCH] Fix setversion for RC/Beta and fix .spec files

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7907 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/shorewall-common.spec | 4 +++-
 Shorewall-lite/shorewall-lite.spec     | 4 +++-
 Shorewall-perl/shorewall-perl.spec     | 4 +++-
 Shorewall-shell/shorewall-shell.spec   | 4 +++-
 tools/build/buildshorewall             | 1 +
 tools/build/setversion                 | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec
index e027f6126..294c60265 100644
--- a/Shorewall-common/shorewall-common.spec
+++ b/Shorewall-common/shorewall-common.spec
@@ -1,6 +1,6 @@
 %define name shorewall-common
 %define version 4.2.0
-%define release RC1
+%define release 0RC1
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -244,6 +244,8 @@ fi
 
 %changelog
 * Wed Dec 12 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.2.0-0RC1
+* Wed Dec 12 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.2.0-RC1
 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.1.3-1
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 2c4e17416..d7024620a 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -1,6 +1,6 @@
 %define name shorewall-lite
 %define version 4.2.0
-%define release RC1
+%define release 0RC1
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -99,6 +99,8 @@ fi
 
 %changelog
 * Wed Dec 12 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.2.0-0RC1
+* Wed Dec 12 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.2.0-RC1
 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.1.3-1
diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec
index d8e2f7452..bfc9f6744 100644
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@@ -1,6 +1,6 @@
 %define name shorewall-perl
 %define version 4.2.0
-%define release RC1
+%define release 0RC1
 
 Summary: Shoreline Firewall Perl-based compiler.
 Name: %{name}
@@ -65,6 +65,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Dec 12 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.2.0-0RC1
+* Wed Dec 12 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.2.0-RC1
 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.1.3-1
diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec
index 32665c8f7..0422b1bee 100644
--- a/Shorewall-shell/shorewall-shell.spec
+++ b/Shorewall-shell/shorewall-shell.spec
@@ -1,6 +1,6 @@
 %define name shorewall-shell
 %define version 4.2.0
-%define release RC1
+%define release 0RC1
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
 Name: %{name}
@@ -82,6 +82,8 @@ fi
 
 %changelog
 * Wed Dec 12 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.2.0-0RC1
+* Wed Dec 12 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.2.0-RC1
 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
 - Updated to 4.1.3-1
diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 72e55645f..33db10079 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -357,6 +357,7 @@ case $VERSION in
 	#
 	# Beta or Release Candidate
 	#
+	BASEVERSION=${VERSION%-*}
 	[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${BASEVERSION} || SHOREWALLDIR=shorewall-common
 	SHOREWALLLITEDIR=shorewall-lite-${BASEVERSION}
 	TARBALL=shorewall-common-${BASEVERSION}.tgz
diff --git a/tools/build/setversion b/tools/build/setversion
index 95e6f0c1e..5ca19e9e6 100755
--- a/tools/build/setversion
+++ b/tools/build/setversion
@@ -37,7 +37,7 @@ case $VERSION in
 	;;
     *-*)
 	RPMVERSION=${VERSION%-*}
-	RELEASE=${VERSION##*-}
+	RELEASE=0${VERSION##*-}
 	;;
     *)
 	RPMVERSION=${VERSION}