mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-22 07:33:43 +01:00
Build updates for Shorewall6 manpages
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9048 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
parent
66abe59ffc
commit
5ab84b0912
@ -333,23 +333,23 @@ echo "Modules file installed as ${PREFIX}/usr/share/shorewall6-lite/modules"
|
||||
# Install the Man Pages
|
||||
#
|
||||
|
||||
#cd manpages
|
||||
cd manpages
|
||||
|
||||
#for f in *.5; do
|
||||
# gzip -c $f > $f.gz
|
||||
# run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
|
||||
# echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
|
||||
#done
|
||||
for f in *.5; do
|
||||
gzip -c $f > $f.gz
|
||||
run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
|
||||
echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
|
||||
done
|
||||
|
||||
#for f in *.8; do
|
||||
# gzip -c $f > $f.gz
|
||||
# run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
|
||||
# echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
|
||||
#done
|
||||
for f in *.8; do
|
||||
gzip -c $f > $f.gz
|
||||
run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
|
||||
echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
|
||||
done
|
||||
|
||||
#cd ..
|
||||
cd ..
|
||||
|
||||
#echo "Man Pages Installed"
|
||||
echo "Man Pages Installed"
|
||||
|
||||
#
|
||||
# Create the version file
|
||||
|
||||
@ -81,6 +81,11 @@ fi
|
||||
%attr(0544,root,root) /usr/share/shorewall6-lite/shorecap
|
||||
%attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup
|
||||
|
||||
%attr(0644,root,root) %{_mandir}/man5/shorewall6-lite.conf.5.gz
|
||||
%attr(0644,root,root) %{_mandir}/man5/shorewall6-lite-vardir.5.gz
|
||||
|
||||
%attr(0644,root,root) %{_mandir}/man8/shorewall6-lite.8.gz
|
||||
|
||||
%doc COPYING changelog.txt releasenotes.txt
|
||||
|
||||
%changelog
|
||||
|
||||
@ -604,23 +604,23 @@ fi
|
||||
# Install the Man Pages
|
||||
#
|
||||
|
||||
#cd manpages
|
||||
cd manpages
|
||||
|
||||
#for f in *.5; do
|
||||
# gzip -c $f > $f.gz
|
||||
# run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
|
||||
# echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
|
||||
#done
|
||||
for f in *.5; do
|
||||
gzip -c $f > $f.gz
|
||||
run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
|
||||
echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
|
||||
done
|
||||
|
||||
#for f in *.8; do
|
||||
# gzip -c $f > $f.gz
|
||||
# run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
|
||||
# echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
|
||||
#done
|
||||
for f in *.8; do
|
||||
gzip -c $f > $f.gz
|
||||
run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
|
||||
echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
|
||||
done
|
||||
|
||||
#cd ..
|
||||
cd ..
|
||||
|
||||
#echo "Man Pages Installed"
|
||||
echo "Man Pages Installed"
|
||||
|
||||
if [ -z "$PREFIX" -a -n "$first_install" -a -z "$CYGWIN" ]; then
|
||||
if [ -n "$DEBIAN" ]; then
|
||||
|
||||
@ -142,6 +142,9 @@ fi
|
||||
%attr(0644,root,root) /usr/share/shorewall6/configfiles/tcdevices
|
||||
%attr(0644,root,root) /usr/share/shorewall6/configfiles/Makefile
|
||||
|
||||
%attr(0644,root,root) %{_mandir}/man5/*
|
||||
%attr(0644,root,root) %{_mandir}/man8/shorewall6.8.gz
|
||||
|
||||
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples6
|
||||
|
||||
%changelog
|
||||
|
||||
@ -98,7 +98,9 @@ BUILDHTML=
|
||||
SAMPLESTAG=
|
||||
SIGN=
|
||||
MANPAGETAG=
|
||||
MANPAGE6TAG=
|
||||
LITEMANPAGETAG=
|
||||
LITE6MANPAGETAG=
|
||||
PERLDIR=
|
||||
SHELLDIR=
|
||||
PERLBRANCH=
|
||||
@ -323,7 +325,9 @@ case $VERSION in
|
||||
SAMPLESTAG="trunk/Samples"
|
||||
SAMPLES6TAG="trunk/Samples6"
|
||||
MANPAGETAG=trunk/manpages
|
||||
MANPAGE6TAG=trunk/manpages6
|
||||
LITEMANPAGETAG=trunk/manpages-lite
|
||||
LITE6MANPAGETAG=trunk/manpages6-lite
|
||||
;;
|
||||
4.2.*.*)
|
||||
PATCHRELEASE=Yes
|
||||
@ -583,27 +587,25 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
||||
if [ -n "$BUILD6" ]; then
|
||||
cd $SHOREWALL6DIR
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$SAMPLES6TAG Samples6 >> $LOGFILE 2>&1"
|
||||
if false; then
|
||||
progress_message "Exporting $MANPAGETAG from SVN..."
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGETAG manpages >> $LOGFILE 2>&1"
|
||||
cd manpages
|
||||
for f in *.xml; do
|
||||
if [ $f != shorewall-template.xml ]; then
|
||||
progress_message "Generating Man Page from $f..."
|
||||
do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
|
||||
case $f in
|
||||
*.conf.*|shorewall.xml)
|
||||
;;
|
||||
*)
|
||||
g=${f#shorewall-}
|
||||
h=$(ls ${g%.xml}.[58])
|
||||
mv $h shorewall-$h
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
rm *.xml
|
||||
fi
|
||||
progress_message "Exporting $MANPAGE6TAG from SVN..."
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGE6TAG manpages >> $LOGFILE 2>&1"
|
||||
cd manpages
|
||||
for f in *.xml; do
|
||||
if [ $f != shorewall6-template.xml ]; then
|
||||
progress_message "Generating Man Page from $f..."
|
||||
do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
|
||||
case $f in
|
||||
*.conf.*|shorewall6.xml)
|
||||
;;
|
||||
*)
|
||||
g=${f#shorewall6-}
|
||||
h=$(ls ${g%.xml}.[58])
|
||||
mv $h shorewall6-$h
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
rm *.xml
|
||||
cd $DIR
|
||||
fi
|
||||
|
||||
@ -631,6 +633,30 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
||||
cd $DIR
|
||||
fi
|
||||
|
||||
if [ -n "$BUILD6LITE" ]; then
|
||||
cd $LITE6DIR
|
||||
progress_message "Exporting $LITE6MANPAGETAG from SVN..."
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$LITE6MANPAGETAG manpages >> $LOGFILE 2>&1"
|
||||
cd manpages
|
||||
for f in *.xml; do
|
||||
if [ $f != shorewall6-template.xml ]; then
|
||||
progress_message "Generating Man Page from $f..."
|
||||
do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
|
||||
case $f in
|
||||
*.conf.*|shorewall6-lite.xml)
|
||||
;;
|
||||
*)
|
||||
g=${f#shorewall6-lite-}
|
||||
h=$(ls ${g%.xml}.[58])
|
||||
mv $h shorewall6-lite-$h
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
rm *.xml
|
||||
cd $DIR
|
||||
fi
|
||||
|
||||
[ -n "$BUILDCOMMON" ] && do_or_die "rm -rf $SHOREWALLDIR/debian"
|
||||
[ -n "$BUILD6" ] && do_or_die "rm -rf $SHOREWALL6DIR/debian"
|
||||
[ -n "$BUILDLITE" ] && do_or_die "rm -rf $SHOREWALLLITEDIR/debian"
|
||||
@ -833,17 +859,25 @@ if [ -n "${BUILDXML}${BUILDHTML}" ]; then
|
||||
cd shorewall-docs-xml-$VERSION
|
||||
|
||||
progress_message "Exporting $MANPAGETAG from SVN..."
|
||||
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGETAG manpages >> $LOGFILE 2>&1"
|
||||
mv manpages manpages.save
|
||||
|
||||
do_or_die mv manpages manpages.save
|
||||
if [ -n "$MANPAGE6TAG" ]; then
|
||||
progress_message "Exporting $MANPAGE6TAG from SVN..."
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGE6TAG manpages >> $LOGFILE 2>&1"
|
||||
do_or_die mv manpages/* manpages.save/
|
||||
fi
|
||||
|
||||
progress_message "Exporting $LITEMANPAGETAG from SVN..."
|
||||
|
||||
progress_message "Exporting $LITEMANPAGETAG from SVN..."
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$LITEMANPAGETAG manpages >> $LOGFILE 2>&1"
|
||||
|
||||
do_or_die mv manpages/* manpages.save/
|
||||
|
||||
if [ -n "$LITE6MANPAGETAG" ]; then
|
||||
progress_message "Exporting $LITE6MANPAGETAG from SVN..."
|
||||
do_or_die "svn export --non-interactive --force ${SVN}/$LITE6MANPAGETAG manpages >> $LOGFILE 2>&1"
|
||||
do_or_die mv manpages/* manpages.save/
|
||||
fi
|
||||
|
||||
do_or_die rm -rf manpages
|
||||
|
||||
do_or_die mv manpages.save manpages
|
||||
|
||||
Loading…
Reference in New Issue
Block a user