1 files changed, 7 insertions, 15 deletions
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 1d2fbb8a8c..8de21d8753 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnucash
-VERSION=${VERSION:-2.6.20}
+VERSION=${VERSION:-2.6.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,6 +71,7 @@ fi
 if [ "$DBI" = "yes" ]; then
   DBIARGS="--enable-dbi --with-dbi-dbd-dir=/usr/lib${LIBDIRSUFFIX}/dbd/ "
   echo " building with dbi enabled"
+  sleep 1
 else
   DBIARGS="--disable-dbi "
 fi
@@ -78,6 +79,7 @@ fi
 if [ "$OFX" = "yes" ]; then
   OFXBANKING="--enable-ofx"
   echo " building with OFX enabled"
+  sleep 1
 else
   OFXBANKING="--disable-ofx"
 fi
@@ -85,6 +87,7 @@ fi
 if [ "$AQ" = "yes" ]; then
   AQBANKING="--enable-aqbanking"
   echo " building with aqbanking enabled"
+  sleep 1
 else
   AQBANKING="--disable-aqbanking"
 fi
@@ -92,19 +95,13 @@ fi
 if [ "$WITH_PYTHON" = "yes" ]; then
   W_PYTHON="--enable-python"
   echo " building with Python bindings enabled"
+  sleep 1
 else
   W_PYTHON="--disable-python"
 fi
 
 set -e
 
-# First, make sure a previous Gnucash installation is removed:
-if [ -e /usr/bin/gnucash ]; then
-  echo "A previous Gnucash installation has been found."
-  echo "Please remove it before running this script."
-  exit 1
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -112,11 +109,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 
-# Restore missing .py files lost from 2.6.19 to 2.6.20:
-if [ "$WITH_PYTHON" = "yes" ]; then
-  cp -nv $CWD/missing-py/* src/optional/python-bindings
-fi
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -134,7 +126,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-register2 \
   $W_PYTHON \
   $OFXBANKING \
   $AQBANKING \
@@ -142,7 +133,8 @@ CXXFLAGS="$SLKCFLAGS" \
   $DBIARGS \
   --build=$ARCH-slackware-linux
 
-# --enable-register2 (not ready for 2.6.0 release)
+# --enable-register2 \ still not ready for prime time
+
 
 make
 make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION