3.1.2

4 files changed, 32 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a5d2e4497f1..f3caa670588b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = hdfview-bin
 	pkgdesc = a GUI browser for reading hdf5 files - prebuilt binaries from the HDF group
-	pkgver = 3.1.1
-	pkgrel = 2
+	pkgver = 3.1.2
+	pkgrel = 1
 	url = https://www.hdfgroup.org/downloads/hdfview/
 	arch = x86_64
 	license = custom
@@ -9,11 +9,9 @@ pkgbase = hdfview-bin
 	conflicts = hdfview-beta
 	conflicts = hdfview
 	replaces = hdfview-beta
-	source = local://HDFView-3.1.1-centos7_64.tar.gz
-	source = HDFView.desktop
-	source = HDF_logo.svg
-	sha512sums = 00ab2365ec8c02028d778d9c0ab0aef495317c1d3e0e5343db776bce89e9e51e3f6d34738c9990e613f16a347ca9107475349fe0da36e99c50576a307e860795
-	sha512sums = c92d8cd4818feabb996b43c81e4e554e16f8120c80c73a5b7cc8bb2c4c4a59bdd47d42b19ec7a3454f855155ba17b65631e7016f891f29ef4ee8fd4ee45caf90
+	source = https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-3.1.2/bin/HDFView-3.1.2-centos7_64.tar.gz
+	source = HDFView.svg
+	sha512sums = b9543baf2ef54d80096a87bfec9644c1f8c75776d8408d70b2c3c5032a841a986266f1f6c1af81d9492b233477788c3227b8b406a7a198ce3b42d1868a497840
 	sha512sums = 649eb81f33a3b38a7ae2ee9a7f286ffa489d0bd7a9f37a0face64fe7956863dcab2131be3792c45dc03b1a6955fda2b37d168698922e938b73c90d24fee7a8c4
 
 pkgname = hdfview-bin
diff --git a/HDFView.desktop b/HDFView.desktop
deleted file mode 100644
index 205a05123f9a..000000000000
--- a/HDFView.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=HDFView
-Comment=HDFView is a GUI tool for browsing and editing HDF4 and HDF5 files.
-Exec=/usr/bin/hdfview %F
-Icon=/usr/share/pixmaps/HDF_logo.svg
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Utility;
-StartupNotify=false
diff --git a/HDF_logo.svg b/HDFView.svg
index 9bcf6a15a4dc..9bcf6a15a4dc 100644
--- a/HDF_logo.svg
+++ b/HDFView.svg
diff --git a/PKGBUILD b/PKGBUILD
index 429492330dfb..bd9c18856c61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor : Bryce Nordgren <bnordgren at gmail dot com>
 pkgname=hdfview-bin
 _pkgname=HDFView
-pkgver=3.1.1
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="a GUI browser for reading hdf5 files - prebuilt binaries from the HDF group"
 arch=('x86_64')
 url="https://www.hdfgroup.org/downloads/hdfview/"
@@ -14,32 +14,38 @@ license=('custom')
 provides=('hdfview')
 replaces=('hdfview-beta')
 conflicts=('hdfview-beta' 'hdfview')
-source=("local://${_pkgname}-${pkgver}-centos7_64.tar.gz"
-        ${_pkgname}.desktop
-        HDF_logo.svg)
-sha512sums=('00ab2365ec8c02028d778d9c0ab0aef495317c1d3e0e5343db776bce89e9e51e3f6d34738c9990e613f16a347ca9107475349fe0da36e99c50576a307e860795'
-            'c92d8cd4818feabb996b43c81e4e554e16f8120c80c73a5b7cc8bb2c4c4a59bdd47d42b19ec7a3454f855155ba17b65631e7016f891f29ef4ee8fd4ee45caf90'
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-${pkgver}/bin/${_pkgname}-${pkgver}-centos7_64.tar.gz"
+        HDFView.svg)
+sha512sums=('b9543baf2ef54d80096a87bfec9644c1f8c75776d8408d70b2c3c5032a841a986266f1f6c1af81d9492b233477788c3227b8b406a7a198ce3b42d1868a497840'
             '649eb81f33a3b38a7ae2ee9a7f286ffa489d0bd7a9f37a0face64fe7956863dcab2131be3792c45dc03b1a6955fda2b37d168698922e938b73c90d24fee7a8c4')
 
 package() {
-  mkdir "${pkgdir}/opt"
-  cp -a "${_pkgname}-${pkgver}-Linux.sh" "${pkgdir}/opt"
-  cd "${pkgdir}/opt"
 
-  # Make extraction non interactive
-  sed -i 's/interactive=TRUE/interactive=FALSE/' ${_pkgname}-${pkgver}-Linux.sh
-  sed -i 's/cpack_skip_license=FALSE/cpack_skip_license=TRUE/' ${_pkgname}-${pkgver}-Linux.sh
+  # Extract RPM
+  bsdtar -xf "${srcdir}/hdfview-${pkgver}-1.x86_64.rpm" -C "${pkgdir}"
 
-  ./${_pkgname}-${pkgver}-Linux.sh
-  rm "${_pkgname}-${pkgver}-Linux.sh"
+  # Add permissions for non-root users:
+  chmod -R go+rX "${pkgdir}/opt/hdfview"
 
+  # Launcher:
   mkdir -p "${pkgdir}/usr/bin"
+  ln -s "/opt/hdfview/bin/HDFView" "${pkgdir}/usr/bin/hdfview"
 
-  # Desktop files, icons, wrappers and license
-  echo "#!/usr/bin/env bash" > "${pkgdir}/usr/bin/hdfview"
-  echo "/opt/HDFView/${pkgver}/hdfview.sh "'-root $PWD "$@"' >> "${pkgdir}/usr/bin/hdfview"
-  chmod 755 "${pkgdir}/usr/bin/hdfview"
-  install -D -m 644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  install -D -m 644 "${srcdir}/HDF_logo.svg" "${pkgdir}/usr/share/pixmaps/HDF_logo.svg"
+  # Higher res icon:
+  rm "${pkgdir}/opt/hdfview/lib/HDFView.png"
+  install -D -m 644 "${srcdir}/HDFView.svg" "${pkgdir}/opt/hdfview/lib/HDFView.svg"
+  sed -i 's/png/svg/g' "${pkgdir}/opt/hdfview/lib/hdfview-HDFView.desktop"
+
+  # Desktop file:
+  # Add missing %F to exec line:
+  sed -i 's:bin/HDFView:bin/HDFView %F:g' "${pkgdir}/opt/hdfview/lib/hdfview-HDFView.desktop"
+  mkdir -p "${pkgdir}/usr/share/applications"
+  mv "${pkgdir}/opt/hdfview/lib/hdfview-HDFView.desktop" "${pkgdir}/usr/share/applications/"
+  
+  # Mimetypes:
+  mkdir -p "${pkgdir}/usr/share/mime/application"
+  mv "${pkgdir}/opt/hdfview/lib/hdfview-HDFView-MimeInfo.xml" "${pkgdir}/usr/share/mime/application/"
+
+  # License:
   install -D -m 644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }