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
This commit is contained in:
teastep 2007-12-12 19:18:43 +00:00
parent 0dd64cab77
commit 438f25c1bd
6 changed files with 14 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -37,7 +37,7 @@ case $VERSION in
;;
*-*)
RPMVERSION=${VERSION%-*}
RELEASE=${VERSION##*-}
RELEASE=0${VERSION##*-}
;;
*)
RPMVERSION=${VERSION}