Fix the Lite installers and .specs

This commit is contained in:
Tom Eastep 2011-03-19 14:14:03 -07:00
parent 895dbfc6dc
commit 0ca0e5f082
4 changed files with 16 additions and 3 deletions

View File

@ -302,6 +302,11 @@ if [ -f modules ]; then
echo "Modules file installed as ${DESTDIR}/usr/share/shorewall-lite/modules" echo "Modules file installed as ${DESTDIR}/usr/share/shorewall-lite/modules"
fi fi
if [ -f helpers ]; then
run_install $OWNERSHIP -m 0600 helpers ${DESTDIR}/usr/share/shorewall-lite
echo "Helper modules file installed as ${DESTDIR}/usr/share/shorewall-lite/helpers"
fi
for f in modules.*; do for f in modules.*; do
run_install $OWNERSHIP -m 0644 $f ${DESTDIR}/usr/share/shorewall-lite/$f run_install $OWNERSHIP -m 0644 $f ${DESTDIR}/usr/share/shorewall-lite/$f
echo "Module file $f installed as ${DESTDIR}/usr/share/shorewall-lite/$f" echo "Module file $f installed as ${DESTDIR}/usr/share/shorewall-lite/$f"

View File

@ -91,6 +91,7 @@ fi
%attr(0644,root,root) /usr/share/shorewall-lite/lib.cli %attr(0644,root,root) /usr/share/shorewall-lite/lib.cli
%attr(0644,root,root) /usr/share/shorewall-lite/lib.common %attr(0644,root,root) /usr/share/shorewall-lite/lib.common
%attr(0644,root,root) /usr/share/shorewall-lite/modules* %attr(0644,root,root) /usr/share/shorewall-lite/modules*
%attr(0644,root,root) /usr/share/shorewall-lite/helpers
%attr(0544,root,root) /usr/share/shorewall-lite/shorecap %attr(0544,root,root) /usr/share/shorewall-lite/shorecap
%attr(0755,root,root) /usr/share/shorewall-lite/wait4ifup %attr(0755,root,root) /usr/share/shorewall-lite/wait4ifup

View File

@ -291,14 +291,20 @@ if [ -f wait4ifup ]; then
echo "wait4ifup installed in ${DESTDIR}/usr/share/shorewall6-lite/wait4ifup" echo "wait4ifup installed in ${DESTDIR}/usr/share/shorewall6-lite/wait4ifup"
fi fi
#
# Install the Modules files
#
if [ -f modules ]; then if [ -f modules ]; then
#
# Install the Modules file
#
run_install $OWNERSHIP -m 0600 modules ${DESTDIR}/usr/share/shorewall6-lite run_install $OWNERSHIP -m 0600 modules ${DESTDIR}/usr/share/shorewall6-lite
echo "Modules file installed as ${DESTDIR}/usr/share/shorewall6-lite/modules" echo "Modules file installed as ${DESTDIR}/usr/share/shorewall6-lite/modules"
fi fi
if [ -f helpers ]; then
run_install $OWNERSHIP -m 0600 helpers ${DESTDIR}/usr/share/shorewall6-lite
echo "Helper modules file installed as ${DESTDIR}/usr/share/shorewall6-lite/modules"
fi
for f in modules.*; do for f in modules.*; do
run_install $OWNERSHIP -m 0644 $f ${DESTDIR}/usr/share/shorewall6-lite/$f run_install $OWNERSHIP -m 0644 $f ${DESTDIR}/usr/share/shorewall6-lite/$f
echo "Modules file $f installed as ${DESTDIR}/usr/share/shorewall6-lite/$f" echo "Modules file $f installed as ${DESTDIR}/usr/share/shorewall6-lite/$f"

View File

@ -82,6 +82,7 @@ fi
%attr(0644,root,root) /usr/share/shorewall6-lite/lib.cli %attr(0644,root,root) /usr/share/shorewall6-lite/lib.cli
%attr(0644,root,root) /usr/share/shorewall6-lite/lib.common %attr(0644,root,root) /usr/share/shorewall6-lite/lib.common
%attr(0644,root,root) /usr/share/shorewall6-lite/modules* %attr(0644,root,root) /usr/share/shorewall6-lite/modules*
%attr(0644,root,root) /usr/share/shorewall6-lite/helpers
%attr(0544,root,root) /usr/share/shorewall6-lite/shorecap %attr(0544,root,root) /usr/share/shorewall6-lite/shorecap
%attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup %attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup