mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-12 12:47:07 +02:00
Remove .diff files before creating tarballs; include .spec files in patch
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7782 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
83dee2b75e
commit
eb2d629e1f
@ -478,7 +478,6 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
|||||||
|
|
||||||
if [ -n "$BUILDLITE" ]; then
|
if [ -n "$BUILDLITE" ]; then
|
||||||
cd $SHOREWALLLITEDIR
|
cd $SHOREWALLLITEDIR
|
||||||
|
|
||||||
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 "svn export --non-interactive --force ${SVN}/$LITEMANPAGETAG manpages >> $LOGFILE 2>&1"
|
||||||
cd manpages
|
cd manpages
|
||||||
@ -501,7 +500,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
|||||||
if [ -n "$BUILDTARBALL" ]; then
|
if [ -n "$BUILDTARBALL" ]; then
|
||||||
if [ -n "$BUILDCOMMON" ]; then
|
if [ -n "$BUILDCOMMON" ]; then
|
||||||
progress_message "Creating $DIR/$TARBALL..."
|
progress_message "Creating $DIR/$TARBALL..."
|
||||||
|
rm -f *.diff
|
||||||
do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1"
|
||||||
do_or_die "tar -jcvf shorewall-common-${BASEVERSION}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -jcvf shorewall-common-${BASEVERSION}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
|
||||||
if [ -n "$SIGN" ]; then
|
if [ -n "$SIGN" ]; then
|
||||||
@ -516,6 +515,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
|||||||
|
|
||||||
if [ -n "$BUILDLITE" ]; then
|
if [ -n "$BUILDLITE" ]; then
|
||||||
progress_message "Creating $DIR/$LITETARBALL..."
|
progress_message "Creating $DIR/$LITETARBALL..."
|
||||||
|
rm -f *.diff
|
||||||
do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
|
||||||
do_or_die "tar -jcvf shorewall-lite-${BASEVERSION}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -jcvf shorewall-lite-${BASEVERSION}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
|
||||||
if [ -n "$SIGN" ]; then
|
if [ -n "$SIGN" ]; then
|
||||||
@ -530,6 +530,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
|||||||
|
|
||||||
if [ -n "$BUILDPERL" ]; then
|
if [ -n "$BUILDPERL" ]; then
|
||||||
progress_message "Creating $DIR/$PERLTARBALL..."
|
progress_message "Creating $DIR/$PERLTARBALL..."
|
||||||
|
rm -f *.diff
|
||||||
do_or_die "tar -zcvf $PERLTARBALL $PERLDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -zcvf $PERLTARBALL $PERLDIR >> $LOGFILE 2>&1"
|
||||||
do_or_die "tar -jcvf shorewall-perl-${BASEVERSION}.tar.bz2 $PERLDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -jcvf shorewall-perl-${BASEVERSION}.tar.bz2 $PERLDIR >> $LOGFILE 2>&1"
|
||||||
|
|
||||||
@ -545,6 +546,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
|||||||
|
|
||||||
if [ -n "$BUILDSHELL" ]; then
|
if [ -n "$BUILDSHELL" ]; then
|
||||||
progress_message "Creating $DIR/$SHELLTARBALL..."
|
progress_message "Creating $DIR/$SHELLTARBALL..."
|
||||||
|
rm -f *.diff
|
||||||
do_or_die "tar -zcvf $SHELLTARBALL $SHELLDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -zcvf $SHELLTARBALL $SHELLDIR >> $LOGFILE 2>&1"
|
||||||
do_or_die "tar -jcvf shorewall-shell-${BASEVERSION}.tar.bz2 $SHELLDIR >> $LOGFILE 2>&1"
|
do_or_die "tar -jcvf shorewall-shell-${BASEVERSION}.tar.bz2 $SHELLDIR >> $LOGFILE 2>&1"
|
||||||
|
|
||||||
|
@ -2,5 +2,4 @@ releasenotes.txt
|
|||||||
changelog.txt
|
changelog.txt
|
||||||
*.5
|
*.5
|
||||||
*.8
|
*.8
|
||||||
*.spec
|
|
||||||
diff*
|
diff*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user