holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix Patch/Beta/RC RPM names in build script

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8058 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-01-13 16:48:00 +00:00
parent 15e54e8e69
commit bbf88e6a66
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/build/buildshorewall
View File

@ -352,34 +352,47 @@ progress_message "Distribution directory is $DIR"
cd $DIR cd $DIR
[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${VERSION} || SHOREWALLDIR=shorewall-common
SHOREWALLLITEDIR=shorewall-lite-${VERSION}
TARBALL=shorewall-common-${VERSION}.tgz
LITETARBALL=shorewall-lite-${VERSION}.tgz
LITETARBALL=shorewall-lite-${VERSION}.tgz
SHELLTARBALL=shorewall-shell-${VERSION}.tgz
SHELLDIR=shorewall-shell-${VERSION}
PERLTARBALL=shorewall-perl-${BASEVERSION}.tgz
PERLDIR=shorewall-perl-${BASEVERSION}
case $VERSION in case $VERSION in
*Beta*|*RC*|*Pre*) *Beta*|*RC*|*Pre*)
# #
# Beta or Release Candidate # Beta or Release Candidate
# #
BASEVERSION=${VERSION%-*} BASEVERSION=${VERSION%-*}
RPMNAME=shorewall-common-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
LITERPMNAME=shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
PERLRPMNAME=shorewall-perl-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
SHELLRPMNAME=shorewall-shell-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
;; ;;
*.*.*.*) *.*.*.*)
# #
# Patch Release # Patch Release
# #
BASEVERSION=${VERSION%-*} RPMNAME=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm
LITERPMNAME=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
PERLRPMNAME=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm
SHELLRPMNAME=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm
;;
*)
#
# Normal Release
#
RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm
SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm
;; ;;
esac esac
[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${VERSION} || SHOREWALLDIR=shorewall-common
SHOREWALLLITEDIR=shorewall-lite-$VERSION
TARBALL=shorewall-common-$VERSION.tgz
LITETARBALL=shorewall-lite-$VERSION.tgz
RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm
PERLDIR=shorewall-perl-$VERSION
PERLTARBALL=shorewall-perl-$VERSION.tgz
SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm
SHELLDIR=shorewall-shell-$VERSION
SHELLTARBALL=shorewall-shell-$VERSION.tgz
HTMLDIR=shorewall-docs-html-$VERSION HTMLDIR=shorewall-docs-html-$VERSION
if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then