Updated to version 2.5.1 ; At the same time/commit -- fixed few blunders in pkgbuild.

3 files changed, 31 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e7b59a6e0ea..c6a98159d919 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = gabedit
 	pkgdesc = A graphical user interface to computational chemistry packages
-	pkgver = 2.5.0
-	pkgrel = 2
+	pkgver = 2.5.1
+	pkgrel = 1
 	url = http://gabedit.sourceforge.net/
 	arch = i686
 	arch = x86_64
 	license = Custom
-	depends = gtkglext-pangox
-	source = http://prdownloads.sourceforge.net/gabedit/GabeditSrc250.tar.gz
-	source = gabedit.desktop
-	sha512sums = c1caf916da81c68fb95f4477e69135ed52738a40427c825be33a4d024f809628fd40bbe153b02a95b01b16d2b3c8b45c8ac470c648003648ff24165af4390943
-	sha512sums = d9d2a7c6aab76ce3ba0ae11a8fd22ae7d3538dbc07221ff81fabf74fbcb57e51c788e31b1e255e99aab0618ed846a2cf3eea7083362151fb798be4fafdac0d4e
+	depends = pangox-compat
+	depends = gtkglext
+	source = GabeditSrc251.tar.gz::https://prdownloads.sourceforge.net/gabedit/GabeditSrc251.tar.gz
+	sha512sums = bc02f95c605ebf0d3dc5ec41254424ba9263d49a473f3f2f9b70d15a0a32548dc90e0ee09c2903cbc24a84632b2103789b5785a83271c943ac2a97d6299e59ef
 
 pkgname = gabedit
-
diff --git a/PKGBUILD b/PKGBUILD
index fb423319712d..d2283ebf043c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,38 @@
 # Maintainer: Hilary Jendrasiak <sylogista@sylogista.pl>
 # Contributor: ross <prwarren8 at gmail dot com>
+# Contributor: gpettinello <g_pet@hotmail.com>
 
 pkgname=gabedit
-pkgver=2.5.0
-pkgrel=2
+pkgver=2.5.1
+pkgrel=1
 pkgdesc='A graphical user interface to computational chemistry packages'
-arch=('x86_64')
+arch=('i686' 'x86_64')
 url='http://gabedit.sourceforge.net/'
 license=('Custom')
-depends=('gtkglext-pangox')
-_pkgver="${pkgver//\./}"
-source=("http://prdownloads.sourceforge.net/gabedit/GabeditSrc$_pkgver.tar.gz" 
-        'gabedit.desktop')
-sha512sums=('c1caf916da81c68fb95f4477e69135ed52738a40427c825be33a4d024f809628fd40bbe153b02a95b01b16d2b3c8b45c8ac470c648003648ff24165af4390943' 
-            'd9d2a7c6aab76ce3ba0ae11a8fd22ae7d3538dbc07221ff81fabf74fbcb57e51c788e31b1e255e99aab0618ed846a2cf3eea7083362151fb798be4fafdac0d4e')
+depends=('pangox-compat' 'gtkglext')
+_pkgver="${pkgver//\./}"  
+_srcdir=".${srcdir}/GabeditSrc${_pkgver}"
+source=("GabeditSrc251.tar.gz::https://prdownloads.sourceforge.net/gabedit/GabeditSrc${_pkgver}.tar.gz")
+sha512sums=('bc02f95c605ebf0d3dc5ec41254424ba9263d49a473f3f2f9b70d15a0a32548dc90e0ee09c2903cbc24a84632b2103789b5785a83271c943ac2a97d6299e59ef')
 
-prepare() {
-  cd "$srcdir/GabeditSrc$_pkgver"
-  cp platforms/CONFIG.unix CONFIG
-  sed -i 's/-Wno-unused-variable/-Wno-unused-variable -fcommon/g' CONFIG
+build()
+{
+    cd ${_srcdir}
+    cp platforms/CONFIG.unix CONFIG
+    sed -i 's/-Wno-unused-variable/-Wno-unused-variable -fcommon/g' CONFIG
+    make
+    #LDFLAGS+=/lib/libm.so.6 make
 }
 
-build() {
-  cd "$srcdir/GabeditSrc$_pkgver"
-  make
-}
-package() {
-  mkdir -p "$pkgdir/usr/bin"
-  mkdir -p "$pkgdir/usr/share/licenses/gabedit"
-  mkdir -p "$pkgdir/usr/share/applications"
+package()
+{
+    mkdir -p "${pkgdir}/usr/bin"
+    mkdir -p "${pkgdir}/usr/share/licenses/gabedit"
+    mkdir -p "${pkgdir}/usr/share/applications/"
 
-  install -D -m655 "$srcdir/GabeditSrc$_pkgver/gabedit" "$pkgdir/usr/bin"
-  install -D -m644 "$srcdir/GabeditSrc$_pkgver/License" \
-    "$pkgdir/usr/share/licenses/gabedit"
+    install -D -m655 "${_srcdir}/gabedit" "${pkgdir}/usr/bin/"
+    install -D -m644 "${_srcdir}/License" "${pkgdir}/usr/share/licenses/gabedit"
 
-  # install .desktop file
-  install -D -m644 "$srcdir/gabedit.desktop" "$pkgdir/usr/share/applications"
-  install -D -m644 "$srcdir/GabeditSrc$_pkgver/icons/Gabedit48.png" \
-    "$pkgdir/usr/share/pixmaps/gabedit.png"
+    install -D -m644 "${_srcdir}/utils/Others/gabedit.desktop" 	"${pkgdir}/usr/share/applications/"
+    install -D -m644 "${_srcdir}/icons/Gabedit48.png" "${pkgdir}/usr/share/pixmaps/gabedit.png"
 }
diff --git a/gabedit.desktop b/gabedit.desktop
deleted file mode 100644
index 318438a4bdb8..000000000000
--- a/gabedit.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=gabedit
-Comment=A graphical user interface to computational chemistry packages
-Exec=gabedit
-Icon=/usr/share/pixmaps/gabedit.png
-Terminal=false