From 4e66f925e496e04c230649c0c9f5c1f08f665211 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 10 Dec 2008 21:41:07 +0000
Subject: [PATCH] Fix -perl.spec

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

diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec
index b2535f817..99a0d537f 100644
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@@ -55,9 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %dir /usr/share/shorewall-perl/Shorewall
 
 %attr(755,root,root) /usr/share/shorewall-perl/compiler.pl
-%attr(0644,root,root) /usr/share/shorewall-perl/prog.header
-%attr(0644,root,root) /usr/share/shorewall-perl/prog.functions
-%attr(0644,root,root) /usr/share/shorewall-perl/prog.footer
+%attr(0644,root,root) /usr/share/shorewall-perl/prog.*
 %attr(0644,root,root) /usr/share/shorewall-perl/version
 %attr(0644,root,root) /usr/share/shorewall-perl/Shorewall/*.pm
 
diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index a9609e7ff..676bf4721 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -320,7 +320,7 @@ case $VERSION in
 	SHELLBRANCH="trunk/Shorewall-shell"
 	DOCTAG="trunk/docs"
 	XMLPROJ="docs-4.3"
-	SAMPLETAGS="trunk/Samples"
+	SAMPLESTAG="trunk/Samples"
 	SAMPLES6TAG="trunk/Samples6"
 	MANPAGETAG=trunk/manpages
 	LITEMANPAGETAG=trunk/manpages-lite
@@ -443,7 +443,11 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
     report "Shorewall Shell directory is $DIR/$SHELLDIR"
     report "Shorewall Perl directory is $DIR/$PERLDIR"
     report "SVN tag is $SVNBRANCH"
+    report "Samples tag is $SAMPLESTAG"
+    report "Samples6 tag is $SAMPLES6TAG"
+    report "SVN6 tag is $SVN6BRANCH"
     report "Lite SVN tag is $LITESVNBRANCH"
+    report "Lite6 SVN tag is $LITE6SVNBRANCH"
     report "Shell SVN tag is $SHELLBRANCH"
     report "Perl SVN tag is $PERLBRANCH"
     if [ -n "$BUILDTARBALL" ]; then