diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 48 |
2 files changed, 33 insertions, 41 deletions
@@ -1,6 +1,6 @@ pkgbase = gsas2-svn pkgdesc = General Structure Analysis System II - refinement for powder diffraction patterns - pkgver = 4063 + pkgver = 4556 pkgrel = 1 url = https://subversion.xray.aps.anl.gov/trac/pyGSAS arch = i686 @@ -8,24 +8,22 @@ pkgbase = gsas2-svn license = unknown makedepends = subversion makedepends = scons - makedepends = python2-numpy - depends = python2 - depends = python2-scipy - depends = python2-matplotlib - depends = python2-opengl - depends = python2-numpy - depends = python2-backports.functools_lru_cache - depends = python2-pillow - depends = python2-h5py - depends = wxpython - depends = gcc-fortran - optdepends = python2-h5py + makedepends = gcc9-fortran + depends = python + depends = python-scipy + depends = python-matplotlib + depends = python-opengl + depends = python-numpy + depends = python-pillow + depends = python-h5py + depends = python-wxpython + depends = python-numpy source = gsas2::svn+https://subversion.xray.aps.anl.gov/pyGSAS/trunk source = GSASII.desktop source = rungsas2 md5sums = SKIP md5sums = 06d168ec9ef40e2eaee88845a2626aed - md5sums = a31e17c7037361bf0ba1fe9a336086db + md5sums = e5b00536edb13ae59cf2226c406e31f7 pkgname = gsas2-svn @@ -3,70 +3,64 @@ pkgname=gsas2-svn _pkgname=gsas2 -pkgver=4063 +pkgver=4556 pkgrel=1 pkgdesc="General Structure Analysis System II - refinement for powder diffraction patterns" arch=(i686 x86_64) url="https://subversion.xray.aps.anl.gov/trac/pyGSAS" license=(unknown) -depends=(python2 python2-scipy python2-matplotlib python2-opengl python2-numpy python2-backports.functools_lru_cache python2-pillow python2-h5py wxpython gcc-fortran) +depends=(python python-scipy python-matplotlib python-opengl python-numpy python-pillow python-h5py python-wxpython python-numpy) [ "${CARCH}" = "x86_64" ] && depends=("${depends[@]}") -makedepends=(subversion scons python2-numpy) -optdepends=(python2-h5py) +makedepends=(subversion scons gcc9-fortran) -source=(#"${_pkgname}::svn+https://subversion.xray.aps.anl.gov/pyGSAS/trunk/#revision=${pkgver}" - "${_pkgname}::svn+https://subversion.xray.aps.anl.gov/pyGSAS/trunk" +source=("${_pkgname}::svn+https://subversion.xray.aps.anl.gov/pyGSAS/trunk" "GSASII.desktop" "rungsas2") md5sums=('SKIP' '06d168ec9ef40e2eaee88845a2626aed' - 'a31e17c7037361bf0ba1fe9a336086db') + 'e5b00536edb13ae59cf2226c406e31f7') pkgver() { cd "${SRCDEST}/${_pkgname}" svnversion | tr -d [A-z] } -prepare() -{ - cd $srcdir/${_pkgname}/fsource - sed -i 's/f2py/f2py2/g' SConstruct -} build() { - cd $srcdir/${_pkgname}/fsource + cd ${srcdir}/${_pkgname}/fsource + sed -i 's/gfortran/gfortran-9/g' SConstruct scons } package() { - mkdir -p "$pkgdir/opt/${_pkgname}" - mkdir -p "$pkgdir/usr/share/licenses/${_pkgname}/" - mkdir -p "$pkgdir/usr/share/applications/" + mkdir -p "${pkgdir}/opt/${_pkgname}" + mkdir -p "${pkgdir}/usr/share/licenses/${_pkgname}/" + mkdir -p "${pkgdir}/usr/share/applications/" - #Install gsas-2 files: - cp -a $srcdir/${_pkgname}/* $pkgdir/opt/${_pkgname} + #install gsas-2 files: + cp -a ${srcdir}/${_pkgname}/* ${pkgdir}/opt/${_pkgname} #remove unecessary libraries for other platforms - ( cd $pkgdir/opt/${_pkgname} + ( cd ${pkgdir}/opt/${_pkgname} rm -r fsource #already in depends rm -rf PyOpenGL-3.0.2a5.zip ) - #Install Desktop files: - install -m 644 -D "$srcdir/GSASII.desktop" "$pkgdir/usr/share/applications/GSASII.desktop" + #install Desktop files: + install -m 644 -D "${srcdir}/GSASII.desktop" "${pkgdir}/usr/share/applications/GSASII.desktop" - #Install and link executables: - cp "$srcdir/rungsas2" "$pkgdir/opt/gsas2/${_pkgname}" - chmod +x "$pkgdir/opt/${_pkgname}/gsas2" + #install and link executables: + cp "${srcdir}/rungsas2" "${pkgdir}/opt/${_pkgname}/${_pkgname}" + chmod +x "${pkgdir}/opt/${_pkgname}/gsas2" - mkdir -p "$pkgdir/usr/bin" + mkdir -p "${pkgdir}/usr/bin" - #Linking executable - ( cd "$pkgdir/usr/bin" + #linking executable + ( cd "${pkgdir}/usr/bin" ln -s ../../opt/${_pkgname}/gsas2 gsas2 ) } |