removing empty or commented out variables, solving numpy dependences, perfect namcap

2 files changed, 21 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b339cdf71695..18d0f71eafc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = python-fitsio-git
 	pkgdesc = A python library to read from and write to FITS files.
-	pkgver = r639.844055b
+	pkgver = r640.507ad1c
 	pkgrel = 1
 	url = https://github.com/esheldon/fitsio.git
+	arch = i686
 	arch = x86_64
 	license = BSD
 	makedepends = git
 	depends = python
-	depends = python-numpy
-	source = python-fitsio-git-r639.844055b::git+https://github.com/esheldon/fitsio.git
+	provides = python-fitsio
+	conflicts = python-fitsio
+	source = python-fitsio::git+https://github.com/esheldon/fitsio.git
 	md5sums = SKIP
 
 pkgname = python-fitsio-git
diff --git a/PKGBUILD b/PKGBUILD
index bb48e2bde244..1605bce134ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,33 @@
-# This is an example PKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
 # Maintainer: Andres Alejandro Navarro Alsina <aanavarroa@unal.edu.co>
 # Contributor: E. Sheldon 
+
 pkgname=python-fitsio-git
-pkgver=r639.844055b
+pkgver=r640.507ad1c
 pkgrel=1
-#epoch=
-
 pkgdesc=" A python library to read from and write to FITS files. "
-
-
-arch=('x86_64')
+arch=('i686' 'x86_64')
 url="https://github.com/esheldon/fitsio.git"
 license=('BSD')
-groups=()
-depends=('python' 'python-numpy')
-makedepends=('git')
-checkdepends=()
-optdepends=()
-#provides=()
-#conflicts=()
-#replaces=()
-#backup=()
-options=()
-install=
-changelog=
-source=("$pkgname-$pkgver::git+${url}")
-#noextract=()
+depends=('python')
+makedepends=('git' )
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("${pkgname%-git}::git+${url}")
 md5sums=('SKIP')
-#validpgpkeys=()
-
+pkgver() {
+	 cd "$srcdir/${pkgname%-git}"
+	 printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 build() {
-	cd "$src"	
-	cd "$pkgname-$pkgver"
+	cd "$srcdir/${pkgname%-git}"
 	python setup.py build
 }
 
 
-pkgver() {
-  cd "$pkgname-$pkgver"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-
 package() {
-	cd "$src"
-	cd "$pkgname-$pkgver"
-	python setup.py install --root=${pkgdir} --prefix=/usr
-	install -Dm644 gpl.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	  cd "$srcdir/${pkgname%-git}"	
+	  python setup.py install --root=${pkgdir} --prefix=/usr
+	  install -Dm644 gpl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
 }