diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 3979d92af..c3e1c8d26 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -86,8 +86,6 @@ fi %attr(0544,root,root) /usr/share/shorewall6-lite/shorecap %attr(0755,root,root) /usr/share/shorewall6-lite/wait4ifup -%attr(0644,root,root) %{_mandir}/man8/shorewall6-lite.8.gz - %doc COPYING changelog.txt releasenotes.txt %changelog diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall index 676bf4721..ea34d9f2f 100755 --- a/tools/build/buildshorewall +++ b/tools/build/buildshorewall @@ -582,7 +582,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then if [ -n "$BUILD6" ]; then cd $SHOREWALL6DIR - do_or_die "svn export --non-interactive --force ${SVN}/$SAMPLES6TAG Samples >> $LOGFILE 2>&1" + 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" @@ -779,10 +779,10 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then cd /tmp rm -rf shorewall6-lite-${BASEVERSION} - do_or_die "cp -a $DIR/$LLITE6DIR shorewall6-lite-${BASEVERSION}" + do_or_die "cp -a $DIR/$LITE6DIR shorewall6-lite-${BASEVERSION}" do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall6-lite-${BASEVERSION}.tgz shorewall6-lite-${BASEVERSION}" cd $DIR - do_or_die "cp $SHOREWALLLITEDIR/shorewall6-lite.spec $RPMDIR/SPECS/" + do_or_die "cp $LITE6DIR/shorewall6-lite.spec $RPMDIR/SPECS/" do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall6-lite.spec" do_or_die cp -a $RPMDIR/RPMS/noarch/$LITE6RPMNAME . fi