version bump and install all package contents

3 files changed, 39 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80451bef521f..6154f5571463 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
+# Generated by mksrcinfo v8
+# Thu May 26 10:53:31 UTC 2016
 pkgbase = ni-visa
 	pkgdesc = National Instruments NI-VISA(TM) Software for Linux
-	pkgver = 15.0.0
+	pkgver = 15.5.0
 	pkgrel = 1
 	url = http://www.ni.com/download/ni-visa-5.4.1/4629/en/
+	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = rpmextract
 	optdepends = python2-pyvisa: python 2 frontend
 	optdepends = python-pyvisa: python 3 frontend
-	source = http://download.ni.com/support/softlib/visa/NI-VISA/15.0/Linux/NI-VISA-15.0.0.iso
-	md5sums = c1dbdfd1f32d3d995b2a75e35e3a81ac
+	source = http://download.ni.com/support/softlib/visa/NI-VISA/15.5/Linux/NI-VISA-15.5.0.iso
+	md5sums = 049033dc8d884c71c53744021e235c3c
 
 pkgname = ni-visa
 
diff --git a/.gitignore b/.gitignore
index ced4029da37f..458cb3659644 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.tar.xz
+*.pkg.tar
 *.iso
 src/
 pkg/
diff --git a/PKGBUILD b/PKGBUILD
index da66325eb92a..5ebaae328041 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,50 @@
 # Maintainer: Grey Christoforo <first name [at] last name [dot] net>
 
 pkgname=ni-visa
-pkgver=15.0.0
+pkgver=15.5.0
 pkgrel=1
 pkgdesc="National Instruments NI-VISA(TM) Software for Linux"
 url="http://www.ni.com/download/ni-visa-5.4.1/4629/en/"
-#arch=('i686' 'x86_64')
-arch=('x86_64')
+arch=('i686' 'x86_64')
+[ "$CARCH" = 'i686' ] && _suffix=i386
+[ "$CARCH" = 'x86_64' ] && _suffix=x86_64
 license=('custom')
 makedepends=('rpmextract')
 optdepends=('python2-pyvisa: python 2 frontend'
 'python-pyvisa: python 3 frontend')
 
-source=("http://download.ni.com/support/softlib/visa/NI-VISA/15.0/Linux/NI-VISA-${pkgver}.iso")
-md5sums=('c1dbdfd1f32d3d995b2a75e35e3a81ac')
+source=("http://download.ni.com/support/softlib/visa/NI-VISA/15.5/Linux/NI-VISA-${pkgver}.iso")
+md5sums=('049033dc8d884c71c53744021e235c3c')
+
+build () {
+  mkdir -p extracted
+  tar -xvf nivisa-${pkgver}f1.tar.gz -C extracted
+  cd extracted/rpms
+  rpmextract.sh *.noarch.rpm
+  rpmextract.sh *.${_suffix}.rpm
+  rm -rf *.rpm
+}
+
 
 package() {
-  tar -xvf nivisa-15.0.0f1.tar.gz
-  cd rpms
-  rpmextract.sh nivisa-15.0.0-f0.x86_64.rpm
+  mv "${srcdir}/extracted/rpms" "${pkgdir}/"
+  cd "${pkgdir}/rpms"
+  mv * ..
+  cd "${srcdir}"
+  rm -rf "${srcdir}/extracted"
+  rm -rf "${pkgdir}/rpms"
+  mkdir -p "${pkgdir}/opt/${pkgname}"
+  cp -a * "${pkgdir}/opt/${pkgname}/."
+
+  cd "${pkgdir}/opt/${pkgname}"
+  rm *.iso
 
-  mv "${srcdir}/rpms/usr" "${pkgdir}"
+  cd "${pkgdir}/usr/local"
+  mv * ..
+  rm -rf "${pkgdir}/usr/local"
+  mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
   
-  #install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 "${srcdir}/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
 }
 
 # vim:set ts=2 sw=2 et: