Allow both Shorewall and Shorewall Lite on the same system without file conflicts

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

Shorewall-lite/shorewall-lite.spec

@@ -82,31 +82,7 @@ fi
 %attr(0544,root,root) /usr/share/shorewall-lite/shorecap
 %attr(0555,root,root) /usr/share/shorewall-lite/wait4ifup
 
-%attr(0444,root,root) %{_mandir}/man5/shorewall-accounting.5.gz
+%attr(0444,root,root) %{_mandir}/man5/shorewall-lite.conf.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-actions.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-blacklist.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall.conf.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-ecn.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-exclusion.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-hosts.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-interfaces.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-maclist.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-masq.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-nat.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-netmap.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-params.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-policy.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-providers.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-proxyarp.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-route_rules.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-routestopped.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-rules.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-tcclasses.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-tcdevices.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-tcrules.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-tos.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-tunnels.5.gz
-%attr(0444,root,root) %{_mandir}/man5/shorewall-zones.5.gz
 
 %attr(0444,root,root) %{_mandir}/man8/shorewall-lite.8.gz
 

Shorewall/changelog.txt

@@ -7,6 +7,8 @@ Changes in 3.4.0 Beta 2
 
 3)  Add wait4ifup.
 
+4)  Rename the shorewall.conf(5) manpage in Shorewall Lite.
+
 Changes in 3.4.0 Beta 1
 
 1)  Correct handling of masq file.

Shorewall/releasenotes.txt

@@ -40,6 +40,11 @@ Problems Corrected in 3.4.0 Beta 2
     compiled script. /usr/share/shorewall/init is a symbolic link
     to the Shorewall init script (usually /etc/init.d/shorewall).
 
+3)  To allow Shorewall and Shorewall Lite to coexist on a single
+    system, the Shorewall section 5 manpages are no longer included in
+    Shorewall Lite. In addition, the Shorewall Lite manpage for
+    "shorewall.conf" has been renamed "shorewall-lite.conf".
+
 Migration Considerations:
 
 1)  Shorewall supports the notion of "default actions". A default
@@ -508,6 +513,7 @@ New Features in Shorewall 3.4:
 	      shorewall-exclusion(5)
 	      shorewall-hosts(5)
 	      shorewall-interfaces(5)
+	      shorewall-lite.conf(5)
 	      shorewall-lite(8)
 	      shorewall-maclist(5)
 	      shorewall-masq(5)

docs/upgrade_issues.xml

@@ -70,8 +70,6 @@
   <section>
     <title>Versions &gt;= 3.4.0-Beta1</title>
 
-    <para></para>
-
     <orderedlist>
       <listitem>
         <para>Shorewall supports the notion of "default actions". A default

manpages-lite/shorewall-lite.conf.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <refentry>
   <refmeta>
-    <refentrytitle>shorewall.conf</refentrytitle>
+    <refentrytitle>shorewall-lite.conf</refentrytitle>
 
     <manvolnum>5</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>shorewall.conf</refname>
+    <refname>shorewall-lite.conf</refname>
 
     <refpurpose>Shorewall Lite global configuration file</refpurpose>
   </refnamediv>

tools/build/makeshorewall

@@ -355,10 +355,8 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 	rm *.xml
 	cd $DIR
 
-	mkdir $SHOREWALLLITEDIR/manpages
-	cp -f $SHOREWALLDIR/manpages/*.5 $SHOREWALLLITEDIR/manpages
-
 	cd $SHOREWALLLITEDIR
+
 	progress_message "Exporting $LITEMANPAGETAG from SVN..."
 	do_or_die "svn export --non-interactive --force ${SVN}/$LITEMANPAGETAG manpages >> $LOGFILE 2>&1"
 	cd manpages