diff --git a/src/usr/doc/THANKS b/src/usr/doc/THANKS index 63dac93..6d0fa45 100644 --- a/src/usr/doc/THANKS +++ b/src/usr/doc/THANKS @@ -90,3 +90,5 @@ We moved to github, so revision number no longer used Sergey V. Marcel Saegebarth Loki Harfagr + Alan + Erich Ritz diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index 642ba8a..0ff4a60 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -3412,6 +3412,8 @@ process_package() { mkdir -p $SB_OUTPUT cd $REPO_DIR/$PKGPATH + mv $PKGNAME.SlackBuild $PKGNAME.SlackBuild.original + cp $PKGNAME.SlackBuild.build $PKGNAME.SlackBuild # Start the actual build # We loop here to enable a 'retry' if anything goes wrong with the build @@ -3475,6 +3477,7 @@ process_package() { # Cleanup cd $REPO_DIR/$PKGPATH + mv $PKGNAME.SlackBuild.original $PKGNAME.SlackBuild rm -f $PKGNAME.{info,SlackBuild}.build rm -f options.build @@ -3499,10 +3502,10 @@ build_package() { # deleting too much or leaving garbage behind us), a nice # approach is to use sbopkg's own temp directory. export TMP=$SBOPKGTMP - nice -n ${NICE:-10} sh $PKGNAME.SlackBuild.build + nice -n ${NICE:-10} sh $PKGNAME.SlackBuild echo "Cleaning up..." else - nice -n ${NICE:-10} sh $PKGNAME.SlackBuild.build + nice -n ${NICE:-10} sh $PKGNAME.SlackBuild fi ) } diff --git a/tools/ChangeLog-latest.txt b/tools/ChangeLog-latest.txt index fc663a0..22bd86f 100644 --- a/tools/ChangeLog-latest.txt +++ b/tools/ChangeLog-latest.txt @@ -1,6 +1,6 @@ SBOPKG NEWS -sbopkg-dev (2018-01-08 23:08:43 UTC) +sbopkg-dev (2018-01-12 00:52:10 UTC) FEATURES * sqg: Parallelize building of single and all packages by option -j. Requires GNU Parallel. @@ -30,6 +30,8 @@ sbopkg-dev (2018-01-08 23:08:43 UTC) * Remove SKIP_EMPTY option. * Fix wrong glob expansion Patch by Alan + * Use correct SlackBuild file name to build package + Patch by Erich Ritz sbopkg 0.38.1 (2016-09-01 13:42 UTC) FEATURES