summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordtbaumann2023-04-15 12:35:24 +0200
committerdtbaumann2023-04-15 12:41:02 +0200
commit2412f88124a2fe69f8d8751a78196bea942aec89 (patch)
tree74ef11394b301f35d92821e72f29d2ccc6d2fb50
parent41d7893112913eb5c1110c794e253aa4f4f3166e (diff)
downloadaur-2412f88124a2fe69f8d8751a78196bea942aec89.tar.gz
update to 3.7.3 and direct phreeqc logs into /tmp
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
2 files changed, 15 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 81ae2bbca8f5..0e1bf0b48097 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
pkgbase = phreeqc
pkgdesc = A Computer Program for Speciation, Batch-Reaction, One-Dimensional Transport, and Inverse Geochemical Calculations
- pkgver = 3.7.3
- pkgrel = 1
+ pkgver = 3.6.2
+ pkgrel = 2
url = http://wwwbrr.cr.usgs.gov/projects/GWC_coupled/phreeqc/
install = install.sh
arch = x86_64
license = custom:CC0
depends = gmp
- source = http://water.usgs.gov/water-resources/software/PHREEQC/phreeqc-3.7.3-15968.tar.gz
+ source = http://water.usgs.gov/water-resources/software/PHREEQC/phreeqc-3.6.2-15100.tar.gz
source = install.sh
source = phreeqc.el
- md5sums = 2e5bdca4c88f1e7ae929e6fc6bd03207
+ source = phreeqc-tmplog.patch
+ md5sums = e820ea246adaa9ad23842d3470c5dde1
md5sums = 8facd6e784cd1985b2c57c092b753002
md5sums = a35830b02368dba33419d904acfd64b4
+ md5sums = 88b218f5687246282a9cca3c3d95118d
pkgname = phreeqc
diff --git a/PKGBUILD b/PKGBUILD
index 282e3d4efc3d..39a28efb5532 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,11 +13,19 @@ install="install.sh"
source=("http://water.usgs.gov/water-resources/software/PHREEQC/${pkgname}-${pkgver}-${_pkgsvn}.tar.gz"
install.sh
phreeqc.el
+<<<<<<< HEAD
phreeqc_tmp_logfile.patch)
md5sums=('e820ea246adaa9ad23842d3470c5dde1'
'8facd6e784cd1985b2c57c092b753002'
'a35830b02368dba33419d904acfd64b4'
'd5674ee727b944d4669e88514874fd51')
+=======
+ phreeqc-tmplog.patch)
+md5sums=('e820ea246adaa9ad23842d3470c5dde1'
+ '8facd6e784cd1985b2c57c092b753002'
+ 'a35830b02368dba33419d904acfd64b4'
+ '88b218f5687246282a9cca3c3d95118d')
+>>>>>>> 6baa1f5 (update to 3.7.3 and direct phreeqc logs into /tmp)
build() {
@@ -31,7 +39,7 @@ package() {
cd "$srcdir/$pkgname-$pkgver-$_pkgsvn"
make DESTDIR="${pkgdir}" install
-
+
# move database and example files into previous location
mkdir -p ${pkgdir}/usr/share/phreeqc/
mv ${pkgdir}/usr/share/doc/phreeqc/database ${pkgdir}/usr/share/phreeqc/