Tweak documentation and fix 'Provides' on shorewall-perl.spec

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6712 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall-common/releasenotes.txt

@@ -29,13 +29,24 @@ Problems corrected in 4.0.0 Beta 7.
 
 Other changes in Shorewall 4.0.0 Beta 7
 
-1)  When an /sbin/shorewall command that begins with 'debug' or 'trace'
+1)                      I M P O R T A N T
+    
+    The name of the Shorewall package has been changed to
+    Shorewall-common. This change, along with changes to the RPM .spec
+    files will allow for automatic upgrade from Shorewall 3.x to
+    Shorewall 4.x on RPM-based distributions such as SuSE, RedHat and
+    CentOS.
+
+    Except for the name change, the Shorewall-common package is the
+    same as the Shorewall package.
+
+2)  When an /sbin/shorewall command that begins with 'debug' or 'trace'
     invokes the Shorewall-perl compiler, the compiler will include
     additional debugging information in its warning and error
     messages. This additional information is intended to help the
     people supporting Shorewall to diagnose the cause of the message.
 
-2)  The script generated by Shorewall-perl now assumes that
+3)  The script generated by Shorewall-perl now assumes that
     iptables-restore and iptables-save are in the same directory as the
     program specified in the IPTABLES setting in Shorewall-conf.
 
@@ -43,20 +54,14 @@ Other changes in Shorewall 4.0.0 Beta 7
     using the PATH setting and the iptables-restore and iptables-save
     programs from the same directory are used.
 
-3)  COMMENTs are now allowed in the accounting file under
+4)  COMMENTs are now allowed in the accounting file under
     Shorewall-perl
 
-4)  The name of the Shorewall package has been changed to
-    Shorewall-common. This change, along with changes to the RPM .spec
-    files will allow for automatic upgrade from Shorewall 3.x to
-    Shorewall 4.x on RPM-based distributions such as SuSE, RedHat and
-    CentOS.
-
 
 Migration Considerations:
 
 1)  You cannot simply upgrade your existing Shorewall package. You must
-    upgrade Shorewall *and* install one or both of the compilers.
+    also install one or both of the compilers.
 
     If you attempt to upgrade using the RPM, you get this result:
 
@@ -67,23 +72,23 @@ Migration Considerations:
 
     You must either:
 
-	rpm -U shorewall-common-4.0.0.noarch.rpm \
+	rpm -U shorewall-shell-4.0.0.noarch.rpm \
-	    shorewall-shell-4.0.0.noarch.rpm
+	    shorewall-common-4.0.0.noarch.rpm
 
     or
 
-	rpm -U shorewall-common-4.0.0.noarch.rpm \
+	rpm -U shorewall-perl-4.0.0.noarch.rpm \
-	    shorewall-perl-4.0.0.noarch.rpm
+	    shorewall-common-4.0.0.noarch.rpm
 	
     or
 
-	rpm -U shorewall-common-4.0.0.noarch.rpm \
+	rpm -U shorewall-shell-4.0.0.noarch.rpm \
 	    shorewall-perl-4.0.0.noarch.rpm \
-	    shorewall-shell-4.0.0.noarch.rpm
+	    shorewall-common-4.0.0.noarch.rpm
  
     If you are upgrading using the tarball, you must install 
     shorewall-shell and/or shorewall-perl before you upgrade
-    Shorewall. Otherwise, the install.sh script fails with:
+    using shorewall-common. Otherwise, the install.sh script fails with:
 
          ERROR: No Shorewall compiler is installed
 

Shorewall-perl/shorewall-perl.spec

@@ -17,6 +17,7 @@ BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: perl shorewall >= 3.4.2
 Provides: shorewall_compiler 
+Provides: shorewall = %{version}-%{release}
 
 %description
 

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-common-4.0.0.noarch.rpm shorewall-shell-4.0.0.noarch.rpm</programlisting>or<programlisting>rpm -U shorewall-common-4.0.0.noarch.rpm shorewall-perl-4.0.0.noarch.rpm</programlisting>or<programlisting>rpm -U shorewall-common-4.0.0.noarch.rpm shorewall-shell-4.0.0.noarch.rpm shorewall-perl-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-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
         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
@@ -117,7 +117,7 @@ gateway:~ #</programlisting> You must either:<programlisting>rpm -U shorewall-co
         <para>The RPMs are set up so that if you upgrade an existing Shorewall
         installation as part of a distribution upgrade and you have not
         already installed shorewall-perl, then you will end up with
-        Shorewall-common and Shorewall-shell installed. </para>
+        Shorewall-common and Shorewall-shell installed.</para>
       </listitem>
 
       <listitem>