Upstream version 3.0.3-1

2 files changed, 28 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05389e38cbe0..fcb509bb9689 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = atsas
 	pkgdesc = A program suite for small-angle scattering data analysis from biological macromolecules
-	pkgver = 3.0.2
+	pkgver = 3.0.3
 	pkgrel = 1
 	url = https://www.embl-hamburg.de/biosaxs/software.html
 	arch = x86_64
 	license = custom
-	depends = gcc7-libs
+	depends = libgfortran.so=5
 	options = !strip
-	source = local://ATSAS-3.0.2-0_amd64.tar.gz
+	source = local://ATSAS-3.0.3-1_amd64.tar.gz
 	source = license.md
 	source = atsas.sh
-	sha512sums = 9bfe7c08d6106747785bb4f49f36604059c904e513ab83fcf490b4f3640f08a0730d49241981e7a6c321dbf1234c6f6f9619100301d14311c6f2144580f12750
+	sha512sums = 6ea7db842d53b2eb0807cdece74ecaedcc3a87066b5e5c086cd60c822b98591567ff76263274e198086c5abeb54a6f5cb0b23742e86dcd63139ed0cdb2a6a38b
 	sha512sums = 3f728fb538b236f0ddce8a7c86303d14c529da4f117eb5f4c87ef5f0fef52dea3ae7650fc439316c08628dc641893ab10f85890577fcb8e67b9398fdbbfa773f
 	sha512sums = d5cf2dd6ee92a6ce9d01cfd5a2a87f081b4ecceecc7839f78c80d5c9a48c81b44f308e185b98e8d844bad8084d0d4946e4a117989a7b36e14db0d577013aecde
 
diff --git a/PKGBUILD b/PKGBUILD
index 8353296acbaa..b68b34b1d33a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,45 @@
 # Maintainer: András Wacha <awacha@gmail.com>
 pkgname=atsas
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="A program suite for small-angle scattering data analysis from biological macromolecules"
 arch=('x86_64')
 url="https://www.embl-hamburg.de/biosaxs/software.html"
 license=('custom')
 options=('!strip')
-depends=( gcc7-libs )
+depends=( 'libgfortran.so=5' )
 
 # !!! You have to download the sources yourself from https://www.embl-hamburg.de/biosaxs/download.html
-# !!! Use the Ubuntu-18.04 version!
+# !!! Use the Ubuntu-20.04 version!
 
-source=('local://ATSAS-3.0.2-0_amd64.tar.gz' 'license.md' 'atsas.sh')
-sha512sums=('9bfe7c08d6106747785bb4f49f36604059c904e513ab83fcf490b4f3640f08a0730d49241981e7a6c321dbf1234c6f6f9619100301d14311c6f2144580f12750'
+source=('local://ATSAS-3.0.3-1_amd64.tar.gz' 'license.md' 'atsas.sh')
+
+sha512sums=('6ea7db842d53b2eb0807cdece74ecaedcc3a87066b5e5c086cd60c822b98591567ff76263274e198086c5abeb54a6f5cb0b23742e86dcd63139ed0cdb2a6a38b'
             '3f728fb538b236f0ddce8a7c86303d14c529da4f117eb5f4c87ef5f0fef52dea3ae7650fc439316c08628dc641893ab10f85890577fcb8e67b9398fdbbfa773f'
             'd5cf2dd6ee92a6ce9d01cfd5a2a87f081b4ecceecc7839f78c80d5c9a48c81b44f308e185b98e8d844bad8084d0d4946e4a117989a7b36e14db0d577013aecde')
 
 
 package() {
-	set > environment.txt
+#	set > environment.txt
 	mkdir -p "${pkgdir}/opt"
-	cp -R "${srcdir}/ATSAS-3.0.2-0" "${pkgdir}/opt/atsas"
+	cp -R "${srcdir}/ATSAS-3.0.3-1" "${pkgdir}/opt/atsas"
 	ATSAS_ROOT=/opt/atsas
-	DEST_BIN_DIR=/opt/atsas/bin
-	GCC7_LIBDIR=$(ls -d /usr/lib/gcc/${CHOST}/7.*)
-	echo "GCC7 libdir: ${GCC7_LIBDIR}"
-	mkdir -p "${pkgdir}/${DEST_BIN_DIR}"
-	mkdir -p "${pkgdir}${ATSAS_ROOT}/libexec"
-	for f in ${pkgdir}${ATSAS_ROOT}/bin/*; do
-		mv $f ${pkgdir}${ATSAS_ROOT}/libexec
-		f=$(basename $f)
-		cat >${pkgdir}${DEST_BIN_DIR}/$f <<EOF
-#!/bin/sh
-export ATSAS=${ATSAS_ROOT} 
-export LD_LIBRARY_PATH=${ATSAS_ROOT}/lib/atsas:${GCC7_LIBDIR}
-${ATSAS_ROOT}/libexec/$f \$*
-EOF
-		chmod +x ${pkgdir}${DEST_BIN_DIR}/$f
-	done
+#	DEST_BIN_DIR=/opt/atsas/bin
+#	GCC7_LIBDIR=$(ls -d /usr/lib/gcc/${CHOST}/7.*)
+#	echo "GCC7 libdir: ${GCC7_LIBDIR}"
+#	mkdir -p "${pkgdir}/${DEST_BIN_DIR}"
+#	mkdir -p "${pkgdir}${ATSAS_ROOT}/libexec"
+#	for f in ${pkgdir}${ATSAS_ROOT}/bin/*; do
+#		mv $f ${pkgdir}${ATSAS_ROOT}/libexec
+#		f=$(basename $f)
+#		cat >${pkgdir}${DEST_BIN_DIR}/$f <<EOF
+##!/bin/sh
+#export ATSAS=${ATSAS_ROOT} 
+#export LD_LIBRARY_PATH=${ATSAS_ROOT}/lib/atsas:${GCC7_LIBDIR}
+#${ATSAS_ROOT}/libexec/$f \$*
+#EOF
+#		chmod +x ${pkgdir}${DEST_BIN_DIR}/$f
+#	done
 	mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
 	cp "${srcdir}/license.md" "${pkgdir}/usr/share/licenses/${pkgname}"
 	mkdir -p "${pkgdir}/etc/profile.d"