From 8022728a9031064a09710689d16f85e5f76329ee Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 16 Jul 2007 00:20:51 +0000
Subject: [PATCH] Correct handling of release notes in staging/upload scripts

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6875 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/build/stage  | 4 ++--
 tools/build/upload | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/build/stage b/tools/build/stage
index 1e6428171..068ffd278 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -80,9 +80,9 @@ esac
 echo "There are no known problems in Shorewall version $1" > known_problems.txt
 
 if [ -f shorewall-lite-${1}/releasenotes.txt ]; then
-    cat shorewall-common-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt
+    cat $SHOREWALL-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt
 else
-    cat shorewall-common-${1}/releasenotes.txt > releasenotes.txt
+    cat $SHOREWALL-${1}/releasenotes.txt > releasenotes.txt
 fi
 
 if [ "$HOSTNAME" = lists ]; then
diff --git a/tools/build/upload b/tools/build/upload
index 15826cbcd..6cd3af3b6 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -87,4 +87,10 @@ else
 	DEST=${USER}:${DEST}
 fi
 
+if [ -f shorewall-lite-${1}/releasenotes.txt ]; then
+    cat $SHOREWALL-${1} shorewall-lite-${1} > releasenotes.txt
+else
+    cp $SHOREWALL-${1}/releasenotes.txt .
+fi
+
 $COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST