From a97517c36405516d9a2b709c08eaab7798719acd Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 24 Nov 2007 18:37:44 +0000
Subject: [PATCH] Only mangle filenames in patch if patch release

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7749 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/build/buildshorewall | 4 +++-
 tools/build/exclude.txt    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index fb45ce574..a819ec45b 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -108,6 +108,7 @@ BUILDCOMMON=
 BUILDPERL=
 BUILDSHELL=
 BUILDLITE=
+PATCHRELEASE=
 ################################################################################
 #                               F U N C T I O N S
 ################################################################################
@@ -335,6 +336,7 @@ case $VERSION in
 	#
 	# Patch Release
 	#
+	PATCHRELEASE=Yes
 	SHOREWALLDIR=shorewall-common-${VERSION%-*}
 	SHOREWALLLITEDIR=shorewall-lite-${VERSION%-*}
 	TARBALL=shorewall-common-${VERSION%-*}.tgz
@@ -907,7 +909,7 @@ if [ -n "$OLDVERSION" ]; then
     [ -n "$BUILDPERL" ]   && diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION >> patch-$VERSION || true
     [ -n "$BUILDSHELL" ]  && diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION >> patch-$VERSION || true
 
-    eval perl -i -p -e "'if ( /\+\+\+/ ) { s/shorewall-common-$VERSION/Shorewall-common/;s/shorewall-lite-$VERSION/Shorewall-lite/;s/shorewall-perl-$VERSION/Shorewall-perl/;s/shorewall-shell-$VERSION/Shorewall-shell/ }'" patch-$VERSION
+    [ -n "$PATCHRELEASE" ] && eval perl -i -p -e "'if ( /\+\+\+/ ) { s/shorewall-common-$VERSION/Shorewall-common/;s/shorewall-lite-$VERSION/Shorewall-lite/;s/shorewall-perl-$VERSION/Shorewall-perl/;s/shorewall-shell-$VERSION/Shorewall-shell/ }'" patch-$VERSION
     
 fi
 
diff --git a/tools/build/exclude.txt b/tools/build/exclude.txt
index 25ff5ac57..fa8690b17 100644
--- a/tools/build/exclude.txt
+++ b/tools/build/exclude.txt
@@ -2,4 +2,5 @@ releasenotes.txt
 changelog.txt
 *.5
 *.8
+*.spec
 diff*