summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorandalenavals2018-01-16 17:01:20 -0500
committerandalenavals2018-01-16 17:01:20 -0500
commit959313cd69c96afaef73bf051e977bf3429df148 (patch)
treefe1178e8844eb7c15585926058530c964cfaabb6
parent4fa3d937c6df06f88e2745ac2c1e29e9cc9010b9 (diff)
downloadaur-959313cd69c96afaef73bf051e977bf3429df148.tar.gz
modified the share folder name, all test are now working
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD32
2 files changed, 32 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f4f3e1a13a..46ceca226c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = python-galsim-git
license = BSD
makedepends = git
makedepends = scons
- makedepends = boost
+ makedepends = boost-libs
makedepends = fftw
makedepends = tmv-git
makedepends = python
@@ -18,12 +18,17 @@ pkgbase = python-galsim-git
pkgname = python-galsim-git
depends = python
depends = boost-libs
- depends = fftw
depends = tmv-git
+ depends = galsim-common-git
pkgname = python2-galsim-git
depends = python2
depends = boost-libs
+ depends = tmv-git
+ depends = galsim-common-git
+
+pkgname = galsim-common-git
+ pkgdesc = common files for python-galsim-git and python2-galsim-git
depends = fftw
depends = tmv-git
diff --git a/PKGBUILD b/PKGBUILD
index bf145d87916..21a7f933ae7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Andres Alejandro Navarro Alsina <aanavarroa@unal.edu.co>
# Contributor: GalSim developers team on GitHub
pkgbase=python-galsim-git
-pkgname=('python-galsim-git' 'python2-galsim-git' )
+pkgname=('python-galsim-git' 'python2-galsim-git' 'galsim-common-git' )
pkgver=v1.5.1.r0.9de448ef9
pkgrel=1
pkgdesc=" The modular galaxy image simulation toolkit "
arch=('i686' 'x86_64')
url="https://github.com/GalSim-developers/GalSim.git"
license=('BSD')
-makedepends=('git' 'scons' 'boost' 'fftw' 'tmv-git' 'python')
+makedepends=('git' 'scons' 'boost-libs' 'fftw' 'tmv-git' 'python')
source=("${pkgbase}::git+${url}")
md5sums=('SKIP')
@@ -40,15 +40,33 @@ check() {
package_python-galsim-git() {
- depends=('python' 'boost-libs' 'fftw' 'tmv-git')
+ depends=('python' 'boost-libs' 'tmv-git' 'galsim-common-git')
cd $pkgbase
- scons PREFIX=$pkgdir/usr FINAL_PREFIX=/usr PYTHON=python install
- install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ scons PREFIX="${pkgdir}"/usr FINAL_PREFIX=/usr PYTHON=python install
+ rm -rf "${pkgdir}"/usr/share
+ rm -f "${pkgdir}"/usr/lib/libgalsim.so
+ rm -f "${pkgdir}"/usr/lib/libgalsim.so.1.5
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
}
package_python2-galsim-git() {
- depends=('python2' 'boost-libs' 'fftw' 'tmv-git' )
+ depends=('python2' 'boost-libs' 'tmv-git' 'galsim-common-git')
cd $pkgbase-py2
scons PREFIX=$pkgdir/usr FINAL_PREFIX=/usr PYTHON=python2 install
- install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+ rm -rf "${pkgdir}"/usr/share
+ rm -f "${pkgdir}"/usr/lib/libgalsim.so
+ rm -f "${pkgdir}"/usr/lib/libgalsim.so.1.5
+ for i in galsim galsim_download_cosmos galsim_json galsim_yaml ; do mv "$pkgdir"/usr/bin/${i}{,2}; done
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
}
+
+package_galsim-common-git() {
+ depends=('fftw' 'tmv-git')
+ pkgdesc='common files for python-galsim-git and python2-galsim-git'
+ cd $pkgbase
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+ mv "${srcdir}"/$pkgbase/share/ "${pkgdir}"/usr/share/galsim/
+ install -Dm644 "${srcdir}"/$pkgbase/lib/libgalsim.so "${pkgdir}"/usr/lib/libgalsim.so
+ install -Dm644 "${srcdir}"/$pkgbase/lib/libgalsim.so.1.5 "${pkgdir}"/usr/lib/libgalsim.so.1.5
+} \ No newline at end of file