From 1be24c7e0d3c5115cc675ed7c582b20b230f449d Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 12 Dec 2008 00:48:41 +0000 Subject: [PATCH] Use correct version of setversion git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9003 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/shorewall-common.spec | 2 ++ Shorewall-lite/shorewall-lite.spec | 2 ++ Shorewall-perl/shorewall-perl.spec | 2 ++ Shorewall-shell/shorewall-shell.spec | 2 ++ Shorewall6-lite/fallback.sh | 2 +- Shorewall6-lite/install.sh | 2 +- Shorewall6-lite/shorewall6-lite.spec | 4 +++- Shorewall6-lite/uninstall.sh | 2 +- Shorewall6/fallback.sh | 2 +- Shorewall6/install.sh | 2 +- Shorewall6/shorewall6.spec | 4 +++- Shorewall6/uninstall.sh | 2 +- tools/build/buildshorewall | 2 +- 13 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec index d2a1deeff..c4569565a 100644 --- a/Shorewall-common/shorewall-common.spec +++ b/Shorewall-common/shorewall-common.spec @@ -177,6 +177,8 @@ fi %changelog * Thu Dec 11 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.1-0base +* Thu Dec 11 2008 Tom Eastep tom@shorewall.net +- Updated to 4.3.1-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.0-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 52cd397b0..408801535 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -100,6 +100,8 @@ fi %changelog * Thu Dec 11 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.1-0base +* Thu Dec 11 2008 Tom Eastep tom@shorewall.net +- Updated to 4.3.1-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.0-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec index db9030d45..b6d244d2a 100644 --- a/Shorewall-perl/shorewall-perl.spec +++ b/Shorewall-perl/shorewall-perl.spec @@ -64,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Dec 11 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.1-0base +* Thu Dec 11 2008 Tom Eastep tom@shorewall.net +- Updated to 4.3.1-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.0-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec index bb8d0805a..74997d1dc 100644 --- a/Shorewall-shell/shorewall-shell.spec +++ b/Shorewall-shell/shorewall-shell.spec @@ -83,6 +83,8 @@ fi %changelog * Thu Dec 11 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.1-0base +* Thu Dec 11 2008 Tom Eastep tom@shorewall.net +- Updated to 4.3.1-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.0-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/fallback.sh b/Shorewall6-lite/fallback.sh index 026cfb3cf..f9a796688 100755 --- a/Shorewall6-lite/fallback.sh +++ b/Shorewall6-lite/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=4.3.0 +VERSION=4.3.1 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 351cef34c..6a48d3134 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.3.0 +VERSION=4.3.1 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 196109799..289c8aab2 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -1,5 +1,5 @@ %define name shorewall6-lite -%define version 4.3.0 +%define version 4.3.1 %define release 0base Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. @@ -84,6 +84,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Thu Dec 11 2008 Tom Eastep tom@shorewall.net +- Updated to 4.3.1-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.0-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index c810e882b..6018d227b 100755 --- a/Shorewall6-lite/uninstall.sh +++ b/Shorewall6-lite/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.3.0 +VERSION=4.3.1 usage() # $1 = exit status { diff --git a/Shorewall6/fallback.sh b/Shorewall6/fallback.sh index e15fd34b4..d18f98cef 100755 --- a/Shorewall6/fallback.sh +++ b/Shorewall6/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=4.3.0 +VERSION=4.3.1 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index d34d073fb..38c66adff 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.3.0 +VERSION=4.3.1 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index e920d0d73..6cbae81a7 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,5 +1,5 @@ %define name shorewall6 -%define version 4.3.0 +%define version 4.3.1 %define release 0base Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. @@ -150,6 +150,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples6 %changelog +* Thu Dec 11 2008 Tom Eastep tom@shorewall.net +- Updated to 4.3.1-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.0-0base * Wed Dec 10 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index f4b5ddff2..5e079a42c 100755 --- a/Shorewall6/uninstall.sh +++ b/Shorewall6/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.3.0 +VERSION=4.3.1 usage() # $1 = exit status { diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall index ea34d9f2f..1e51be26b 100755 --- a/tools/build/buildshorewall +++ b/tools/build/buildshorewall @@ -427,7 +427,7 @@ case $VERSION in RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm RPM6NAME=shorewall6-${VERSION}-0base.noarch.rpm LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm - LITE6RPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm + LITE6RPMNAME=shorewall6-lite-${VERSION}-0base.noarch.rpm PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm ;;