1 files changed, 14 insertions, 15 deletions
diff --git a/academic/pyCRAC/pyCRAC.SlackBuild b/academic/pyCRAC/pyCRAC.SlackBuild
index f94cec426b..6482133f42 100644
--- a/academic/pyCRAC/pyCRAC.SlackBuild
+++ b/academic/pyCRAC/pyCRAC.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pyCRAC
 
-# Copyright 2017 Rob van Nues
+# Copyright 2017-2021 Rob van Nues
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pyCRAC
-VERSION=${VERSION:-1.4.6}
+VERSION=${VERSION:-1.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,9 +36,9 @@ PYTHON2=false
 PYTHON3=true
 
 
-PIPENAM=kinetic_crac_pipeline
-PIPEVER=${PIPEVER:-ffe91cc6bf7a}
-PIPETAG=sgrann
+PIPENAM=crac_pipelines
+PIPEVER=master
+#PIPETAG=sgrann
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -73,20 +73,21 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-rm -rf $PIPETAG-$PIPENAM-$PIPEVER
+#rm -rf $PIPETAG-$PIPENAM-$PIPEVER
+rm -rf $PIPENAM-$PIPEVER
 
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 mkdir $PRGNAM/$PIPENAM
 
-if [[ -f $CWD/$PIPETAG-$PIPENAM-$PIPEVER.tar.gz ]]; then
- tar xvf $CWD/$PIPETAG-$PIPENAM-$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
-elif [[ -f $CWD/$PIPEVER.tar.gz ]]; then
- tar xvf $CWD/$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
+if [[ -f $CWD/$PIPENAM-$PIPEVER.tar.gz ]]; then
+ tar xvf $CWD/$PIPENAM-$PIPEVER.tar.gz -C $PRGNAM/$PIPENAM --strip-components=1
+else
+ echo "$PIPENAM-$PIPEVER.tar.gz not found"
 fi
 
 #replace setup.py; test.sh
-rm setup.py
+mv setup.py setup.py.ORIG
 cp $CWD/setup_slack.py setup.py
 rm tests/test.sh
 cp $CWD/test_slack.sh tests/test.sh
@@ -108,14 +109,12 @@ fi
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# The pipeline-R script
-mkdir -p $PKG/usr/share/$PRGNAM-$VERSION/$PIPENAM
-cp $PRGNAM/$PIPENAM/gaussianProcessAnalysis.R $PKG/usr/share/$PRGNAM-$VERSION/$PIPENAM
-
 # the manual etc.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   README.md \
+  setup.py.ORIG \
+  The_pyCRAC_Manual.pdf \
   $CWD/README.tests $CWD/setup_slack.py \
   $CWD/README \
   $PKG/usr/doc/$PRGNAM-$VERSION