From 8c9b1767cf908c3255b4cda427abf89c7a5e9c45 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 29 Jun 2007 19:38:23 +0000
Subject: [PATCH] Note that shorewall-shell must be unstalled on rpm upgrades

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6713 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/releasenotes.txt | 12 ++++++------
 docs/Shorewall-4.xml              |  3 ++-
 docs/upgrade_issues.xml           |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index 805b94eed..20cf50f64 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -63,7 +63,8 @@ Migration Considerations:
 1)  You cannot simply upgrade your existing Shorewall package. You must
     also install one or both of the compilers.
 
-    If you attempt to upgrade using the RPM, you get this result:
+    If you attempt to upgrade using the shorewall-common RPM, you get
+    this result:
 
     gateway:~ # rpm -Uvh shorewall-common-4.0.0.noarch.rpm 
     error: Failed dependencies:
@@ -75,16 +76,15 @@ Migration Considerations:
 	rpm -U shorewall-shell-4.0.0.noarch.rpm \
 	    shorewall-common-4.0.0.noarch.rpm
 
-    or
-
-	rpm -U shorewall-perl-4.0.0.noarch.rpm \
-	    shorewall-common-4.0.0.noarch.rpm
-	
     or
 
 	rpm -U shorewall-shell-4.0.0.noarch.rpm \
 	    shorewall-perl-4.0.0.noarch.rpm \
 	    shorewall-common-4.0.0.noarch.rpm
+
+    If you don't want shorewall-shell, use the second command then
+
+        rpm -e shorewall-shell
  
     If you are upgrading using the tarball, you must install 
     shorewall-shell and/or shorewall-perl before you upgrade
diff --git a/docs/Shorewall-4.xml b/docs/Shorewall-4.xml
index 56694c89c..97c8d0eb7 100644
--- a/docs/Shorewall-4.xml
+++ b/docs/Shorewall-4.xml
@@ -126,7 +126,8 @@
     Shorewall-shell and/or Shorewall-perl; in fact, if you are using the
     tarball for your installation, you must install Shorewall-shell and/or
     Shorewall-perl <emphasis role="bold">before</emphasis> you upgrade
-    Shorewall. See the release notes.</para>
+    Shorewall. See the <ulink url="upgrade_issues.htm">upgrade issues</ulink>
+    for details.</para>
   </section>
 
   <section id="Prereqs">
diff --git a/docs/upgrade_issues.xml b/docs/upgrade_issues.xml
index 09e2bacd0..9ddba3a8b 100644
--- a/docs/upgrade_issues.xml
+++ b/docs/upgrade_issues.xml
@@ -104,7 +104,7 @@
         result:<programlisting>gateway:~ # rpm -Uvh shorewall-common-4.0.0.noarch.rpm 
 error: Failed dependencies:
 shorewall_compiler is needed by shorewall-common-4.0.0-1.noarch
-gateway:~ #</programlisting> You must either:<programlisting>rpm -U shorewall-shell-4.0.0.noarch.rpm shorewall-common-4.0.0.noarch.rpm</programlisting>or<programlisting>rpm -U shorewall-perl-4.0.0.noarch.rpm shorewall-common-4.0.0.noarch.rpm</programlisting>or<programlisting>rpm -U shorewall-shell-4.0.0.noarch.rpm shorewall-perl-4.0.0.noarch.rpm shorewall-common-4.0.0.noarch.rpm</programlisting>If
+gateway:~ #</programlisting> You must either:<programlisting>rpm -U shorewall-shell-4.0.0.noarch.rpm shorewall-common-4.0.0.noarch.rpm</programlisting>or<programlisting>rpm -U shorewall-shell-4.0.0.noarch.rpm shorewall-perl-4.0.0.noarch.rpm shorewall-common-4.0.0.noarch.rpm</programlisting>If
         you are upgrading using the tarball, you must install either
         shorewall-shell or shorewall-perl before you upgrade Shorewall using
         the Shorewall-common tarball. Otherwise, the install.sh script fails