diff options
| -rw-r--r-- | academic/avogadrolibs/avogadrolibs.SlackBuild | 16 | ||||
| -rw-r--r-- | academic/avogadrolibs/avogadrolibs.info | 12 |
2 files changed, 20 insertions, 8 deletions
diff --git a/academic/avogadrolibs/avogadrolibs.SlackBuild b/academic/avogadrolibs/avogadrolibs.SlackBuild index fc45449bcad98..8ac9c170813f9 100644 --- a/academic/avogadrolibs/avogadrolibs.SlackBuild +++ b/academic/avogadrolibs/avogadrolibs.SlackBuild @@ -25,12 +25,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=avogadrolibs -VERSION=${VERSION:-1.95.1} +VERSION=${VERSION:-1.96.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} MVERSION=${MVERSION:-1.0.0} CVERSION=${CVERSION:-1.0.1} +AVERSION=${AVERSION:-1.96} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -58,6 +59,7 @@ USEMMTF="" ; [ "${MMTF:-yes}" = "no" ] && USEMMTF="-DUSE_MMTF=OFF" TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +GENXRDPATH=$TMP/$PRGNAM-$VERSION/build/avogadro/qtplugins/plotxrd/bin if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -88,7 +90,8 @@ tar xvf $CWD/crystals-$CVERSION.tar.gz mv molecules-$MVERSION molecules mv crystals-$CVERSION crystals if [ "${PYTHON}" = "yes" ]; then - tar xvf $CWD/avogadrogenerators.tar.gz + tar xvf $CWD/avogenerators-$AVERSION.tar.gz + mv avogenerators-$AVERSION avogadrogenerators fi # Now we can change directory to $PRGNAM-$VERSION @@ -104,6 +107,13 @@ find -L . \ patch -p1 < $CWD/fix_cmake-find-package.diff mkdir -p build +# Following steps prevent the download of the executable genXrdPattern +# needed by the build process and include it in the source tree +mkdir -p $GENXRDPATH +cp $CWD/linux64-genXrdPattern $GENXRDPATH +mv $GENXRDPATH/linux64-genXrdPattern $GENXRDPATH/genXrdPattern +chmod 755 $GENXRDPATH/genXrdPattern + cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -129,7 +139,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.md LICENSE $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.md LICENSE CITATION.cff $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Remove doc files installed by make install in /usr/share/doc/AvogadroLibs that are redundant diff --git a/academic/avogadrolibs/avogadrolibs.info b/academic/avogadrolibs/avogadrolibs.info index 98b38a281f496..252fdcdb7e56e 100644 --- a/academic/avogadrolibs/avogadrolibs.info +++ b/academic/avogadrolibs/avogadrolibs.info @@ -1,14 +1,16 @@ PRGNAM="avogadrolibs" -VERSION="1.95.1" +VERSION="1.96.0" HOMEPAGE="https://github.com/OpenChemistry/avogadrolibs" -DOWNLOAD="https://github.com/OpenChemistry/avogadrolibs/archive/1.95.1/avogadrolibs-1.95.1.tar.gz \ +DOWNLOAD="https://github.com/OpenChemistry/avogadrolibs/archive/1.96.0/avogadrolibs-1.96.0.tar.gz \ https://github.com/OpenChemistry/molecules/archive/1.0.0/molecules-1.0.0.tar.gz \ https://github.com/OpenChemistry/crystals/archive/1.0.1/crystals-1.0.1.tar.gz \ - https://github.com/giandex/misc/raw/main/avogadrogenerators.tar.gz" -MD5SUM="8e86fd39799bcc614f8982b3408f30b5 \ + https://github.com/OpenChemistry/avogenerators/archive/1.96/avogenerators-1.96.tar.gz \ + https://github.com/psavery/genXrdPattern/releases/download/1.0-static/linux64-genXrdPattern" +MD5SUM="f3067325b07e6a475d5338aa89247141 \ bad118f80a942fe0f082b2a9075ae3b9 \ b05b526928b89fd27a5784b24c419613 \ - 4d8fe7ddb99069d777bead7d261abac9" + f5d12323f5243b2b8f4dcc79d149de48 \ + e1b3c1d6b951ed83a037567490d75f1d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="molequeue mmtf-cpp libmsym spglib" |