fixes + update to current HEAD

building it now under a clean chroot.  As ChlorisPaleGreen noted,
the cctbx.tar.bz2 checksum was wrong and rsync was missing as build dependency.

2 files changed, 12 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 227d8d624ca2..83287fd2a44b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = objcryst-fox
 	pkgdesc = A program for the ab initio structure determination from powder diffraction
-	pkgver = 2017.2.27
+	pkgver = 2017.2.29
 	pkgrel = 1
 	url = http://fox.vincefn.net/FoxWiki
 	arch = i686
@@ -8,6 +8,7 @@ pkgbase = objcryst-fox
 	license = GPL2
 	makedepends = libmariadbclient
 	makedepends = newmat
+	makedepends = rsync
 	depends = glu
 	depends = freeglut
 	depends = wxgtk2
@@ -15,13 +16,13 @@ pkgbase = objcryst-fox
 	noextract = cctbx.tar.bz2
 	noextract = boost_1_68_0.tar.bz2
 	source = Fox.desktop
-	source = objcryst-2017.2.27.tar.gz::https://github.com/vincefn/objcryst/archive/5d39b64a641e2707d35ff3d0977b00f5ecf57831.tar.gz
+	source = objcryst-2017.2.29.tar.gz::https://github.com/vincefn/objcryst/archive/05954fd9c2e0fb80571a3d63fbd7ab8666655ee9.tar.gz
 	source = https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.bz2
 	source = http://downloads.sourceforge.net/project/objcryst/3rdPartyLibraries/cctbx.tar.bz2
 	sha1sums = 6d8bb12fe1add4481ac1733e9cf6aea57aedee61
-	sha1sums = a542bdd57433bf143b751c0fca2c383cd71833af
+	sha1sums = 037a633155160f036997c8b422653e69a87ebaa2
 	sha1sums = 18863a7cae4d58ae85eb63d400f774f60a383411
-	sha1sums = 1aa2d033d45a86e928ee58196fe5916da9376c18
+	sha1sums = 76f82bae08b2412eb90a05a558dc746274ca8e7b
 
 pkgname = objcryst-fox
 
diff --git a/PKGBUILD b/PKGBUILD
index 38d9aa7bcab3..4d28cca42ad7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Mirko Scholz <srtlg>
 pkgname=objcryst-fox
-pkgver=2017.2.27
+pkgver=2017.2.29
 pkgrel=1
 pkgdesc='A program for the ab initio structure determination from powder diffraction'
 arch=('i686' 'x86_64')
 url='http://fox.vincefn.net/FoxWiki'
 depends=('glu' 'freeglut' 'wxgtk2' 'fftw')
-makedepends=('libmariadbclient' 'newmat')
+makedepends=('libmariadbclient' 'newmat' 'rsync')
 license=('GPL2')
 #_objcryst_ver=v${pkgver}
-_objcryst_ver=5d39b64a641e2707d35ff3d0977b00f5ecf57831
+_objcryst_ver=05954fd9c2e0fb80571a3d63fbd7ab8666655ee9
 _boost_ver=1.68.0
 source=(
 "Fox.desktop"
@@ -18,9 +18,10 @@ source=(
 "http://downloads.sourceforge.net/project/objcryst/3rdPartyLibraries/cctbx.tar.bz2")
 noextract=("cctbx.tar.bz2" "boost_${_boost_ver//./_}.tar.bz2")
 sha1sums=('6d8bb12fe1add4481ac1733e9cf6aea57aedee61'
-          'a542bdd57433bf143b751c0fca2c383cd71833af'
+          '037a633155160f036997c8b422653e69a87ebaa2'
           '18863a7cae4d58ae85eb63d400f774f60a383411'
-          '1aa2d033d45a86e928ee58196fe5916da9376c18')
+          '76f82bae08b2412eb90a05a558dc746274ca8e7b')
+
 
 prepare() {
 	cd "${srcdir}/"
@@ -48,8 +49,7 @@ package() {
 	cd "${srcdir}"
 	_objcryst_dir=`tar tf objcryst-${pkgver}.tar.gz | head -1`
 	cd "${srcdir}/${_objcryst_dir}"
-	mkdir -p "${pkgdir}/usr/bin"
-	make install -C Fox "DESTDIR=${pkgdir}/usr/bin/"
+	make install -C Fox "DESTDIR=${pkgdir}/usr/bin/Fox"
 	install -Dm644 ${srcdir}/Fox.desktop "${pkgdir}/usr/share/applications/Fox.desktop"
 	install -Dm644 Fox/src/Fox.xpm "${pkgdir}/usr/share/pixmaps/Fox.xpm"
 }