update to v2011.365.P4

6 files changed, 58 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9a1d991d271..7bddfe604c32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jun 11 03:14:49 UTC 2016
+# Fri May 11 09:52:04 UTC 2018
 pkgbase = pqlx
 	pkgdesc = An open-source software for evaluating seismic station performance and data quality.
-	pkgver = 2011.365.P1
+	pkgver = 2011.365.P4
 	pkgrel = 1
 	url = http://ds.iris.edu/ds/nodes/dmc/software/downloads/pqlx
 	install = pqlx.install
@@ -10,10 +10,17 @@ pkgbase = pqlx
 	arch = x86_64
 	license = custom
 	makedepends = python2-virtualenv
-	depends = gtk2>=2.14
-	depends = mysql>=5.0.18
-	source = http://PQLXtars:getPQLX@wush.net/svn/PQLX/tars/PQLX.v2011.365.P1.tar.bz2
-	md5sums = 1376629b35bf3b4ed7fefb321ff06170
+	depends = gtk2
+	depends = libtirpc
+	depends = mariadb
+	source = https://ds.iris.edu/pub/programs/pqlx/PQLX.v2011.365.P4.tar.bz2
+	source = profile.d_pqlx.sh
+	source = systemd_sysusers.d_pqlx.conf
+	source = systemd_tmpfiles.d_pqlx.conf
+	sha256sums = 60d045e0b0b45c1afaaaa19216019b5221a9f6d068a11aede8385c2dc9952573
+	sha256sums = aa600c8360e19e39633b0a59c753491ef90f1dc1c939a1f305e769398f819f3c
+	sha256sums = 3a3ec5aa8a38d807896beee3decd6ea6212ae430129c670d0fc1db2fce7d76fd
+	sha256sums = 13ec352bb4db152ff8adb1a865595058fa0f1a0788484683bf90d669ccde3e03
 
 pkgname = pqlx
 
diff --git a/PKGBUILD b/PKGBUILD
index bcd8ccd9a056..0d6f89a8d3d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,57 @@
 # Maintainer: Mohammadreza Abdollahzadeh <morealaz@gmail.com>
 
 pkgname="pqlx"
-pkgver=2011.365.P1 
+pkgver=2011.365.P4 
 pkgrel=1
 pkgdesc="An open-source software for evaluating seismic station performance and data quality."
 arch=('i686' 'x86_64')
 url='http://ds.iris.edu/ds/nodes/dmc/software/downloads/pqlx'
 license=('custom')
-depends=("gtk2>=2.14" "mysql>=5.0.18")
+depends=('gtk2' 'libtirpc' 'mariadb')
 makedepends=("python2-virtualenv")
-source=("http://PQLXtars:getPQLX@wush.net/svn/PQLX/tars/PQLX.v${pkgver}.tar.bz2")
-md5sums=('1376629b35bf3b4ed7fefb321ff06170')
+source=("https://ds.iris.edu/pub/programs/${pkgname}/PQLX.v${pkgver}.tar.bz2"
+        "profile.d_pqlx.sh"
+        "systemd_sysusers.d_pqlx.conf"
+        "systemd_tmpfiles.d_pqlx.conf")
+sha256sums=('60d045e0b0b45c1afaaaa19216019b5221a9f6d068a11aede8385c2dc9952573'
+            'aa600c8360e19e39633b0a59c753491ef90f1dc1c939a1f305e769398f819f3c'
+            '3a3ec5aa8a38d807896beee3decd6ea6212ae430129c670d0fc1db2fce7d76fd'
+            '13ec352bb4db152ff8adb1a865595058fa0f1a0788484683bf90d669ccde3e03')
 install=$pkgname.install
 
 prepare() {
-    cd ${srcdir}/v${pkgver}/PQLX
-    cp env/mysql.vars.sample env/mysql.vars
-    sed -i 's/uname -i/uname -m/' env/makeVars
+  cd v${pkgver}/PQLX
+  cp env/mysql.vars.sample env/mysql.vars
+  sed -i 's/uname -i/uname -m/' env/makeVars
+  sed -i 's/PKGCFG=`pkg-config --cflags gtk+-2.0 cairo`/PKGCFG=`pkg-config --cflags gtk+-2.0 cairo libtirpc`/' src/utils/data/makefile
+  sed -i 's/PKGCFGL=`pkg-config --libs gio-2.0 gtk+-2.0 gthread-2.0`/PKGCFGL=`pkg-config --libs gio-2.0 gtk+-2.0 gthread-2.0 libtirpc`/' src/srvr/pqlxSrvr/makefile
+  sed -i 's/PKGCFGL=`pkg-config --libs gtk+-2.0 gthread-2.0`/PKGCFGL=`pkg-config --libs gtk+-2.0 gthread-2.0 libtirpc`/' src/clnt/PQLX/makefile
 }
 
 build() {
-    export PQLX=${srcdir}/v${pkgver}/PQLX
-    virtualenv2 ${PQLX}
-    source ${PQLX}/bin/activate
-    bash ${PQLX}/env/makeAll
-    sed -i 's:/\\\,//:/-MariaDB\\\,//:' ${PQLX}/PROD/bin/LINUX/initPQLXdb.sh
-    sed -i 's:grep 5\.\*:sed -e s/-MariaDB\\\,//:' ${PQLX}/PROD/bin/LINUX/initPQLXdb.sh
+  export PQLX=${srcdir}/v${pkgver}/PQLX
+  virtualenv2 ${PQLX}
+  source ${PQLX}/bin/activate
+  bash ${PQLX}/env/makeAll
+  sed -i 's:/\\\,//:/-MariaDB\\\,//:' ${PQLX}/PROD/bin/LINUX/initPQLXdb.sh
+  sed -i 's:grep 5\.\*:sed -e s/-MariaDB\\\,//:' ${PQLX}/PROD/bin/LINUX/initPQLXdb.sh
 }
 
 package() {
-    install -d ${pkgdir}/opt/pqlx
-    install -d ${pkgdir}/usr/bin
-    cp -a ${srcdir}/v${pkgver}/PQLX/{PROD,docs} ${pkgdir}/opt/pqlx/
-    ln -s /opt/pqlx/PROD/bin/LINUX/pqlx ${pkgdir}/usr/bin/
-    ln -s /opt/pqlx/PROD/bin/LINUX/pqlx-admin ${pkgdir}/usr/bin/
-    ln -s /opt/pqlx/PROD/bin/LINUX/pqlxDBMaint ${pkgdir}/usr/bin/
-    ln -s /opt/pqlx/PROD/bin/LINUX/pqlxPNG ${pkgdir}/usr/bin/
-    ln -s /opt/pqlx/PROD/bin/LINUX/pqlxSrvr ${pkgdir}/usr/bin/
-    ln -s /opt/pqlx/PROD/bin/LINUX/importTT ${pkgdir}/usr/bin/
+  install -d ${pkgdir}/opt/pqlx/{PROD,docs}
+  install -d ${pkgdir}/usr/bin/
+  cp -a "${srcdir}"/v${pkgver}/PQLX/{PROD,docs} ${pkgdir}/opt/pqlx/ 
+  install -Dm644 "${srcdir}"/profile.d_${pkgname}.sh \
+                 "${pkgdir}"/etc/profile.d/${pkgname}.sh
+  install -Dm644 "${srcdir}"/systemd_sysusers.d_${pkgname}.conf \
+                 "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
+  install -Dm644 "${srcdir}"/systemd_tmpfiles.d_${pkgname}.conf \
+                 "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
+  ln -s /opt/pqlx/PROD/bin/LINUX/pqlx        ${pkgdir}/usr/bin/
+  ln -s /opt/pqlx/PROD/bin/LINUX/pqlx-admin  ${pkgdir}/usr/bin/
+  ln -s /opt/pqlx/PROD/bin/LINUX/pqlxDBMaint ${pkgdir}/usr/bin/
+  ln -s /opt/pqlx/PROD/bin/LINUX/pqlxPNG     ${pkgdir}/usr/bin/
+  ln -s /opt/pqlx/PROD/bin/LINUX/pqlxSrvr    ${pkgdir}/usr/bin/
+  ln -s /opt/pqlx/PROD/bin/LINUX/importTT    ${pkgdir}/usr/bin/
 }
+# vim:set ts=2 sw=2 et:
diff --git a/pqlx.install b/pqlx.install
index 98e7d7940390..d814d5173334 100644
--- a/pqlx.install
+++ b/pqlx.install
@@ -1,14 +1,7 @@
 post_install() {
     echo -e "\e[1;33m==> NOTICE:\e[0m before using this software"
-	echo -e "\e[1;32m==>\e[0m Add following two lines to your bashrc or zshrc file:"
-	echo "    export PQLX=/opt/pqlx"
-	echo "    source /opt/pqlx/PROD/PQLXprodVars"
+	echo -e "\e[1;32m==>\e[0m Add your user to pqlx group and relogin:"
+	echo "    sudo gpasswd -a $USER pqlx"
 	echo -e "\e[1;32m==>\e[0m Initialize MySQl for PQLX:"
 	echo "    bash /opt/pqlx/PROD/bin/LINUX/initPQLXdb.sh"
 }
-
-post_remove() {
-	echo -e "\e[1;33m==> WARNING\e[0m Please remove following two lines from your bashrc or zshrc file:"
-	echo "    export PQLX=/opt/pqlx"
-	echo "    source /opt/pqlx/PROD/PQLXprodVars"
-}
diff --git a/profile.d_pqlx.sh b/profile.d_pqlx.sh
new file mode 100644
index 000000000000..ee5abe541415
--- /dev/null
+++ b/profile.d_pqlx.sh
@@ -0,0 +1,3 @@
+#pqlx environment variables
+export PQLX=/opt/pqlx
+source /opt/pqlx/PROD/PQLXprodVars
diff --git a/systemd_sysusers.d_pqlx.conf b/systemd_sysusers.d_pqlx.conf
new file mode 100644
index 000000000000..3384669c4276
--- /dev/null
+++ b/systemd_sysusers.d_pqlx.conf
@@ -0,0 +1 @@
+u pqlx - "PQLX user"
diff --git a/systemd_tmpfiles.d_pqlx.conf b/systemd_tmpfiles.d_pqlx.conf
new file mode 100644
index 000000000000..4a0aeb483b7f
--- /dev/null
+++ b/systemd_tmpfiles.d_pqlx.conf
@@ -0,0 +1 @@
+Z /opt/pqlx/PROD 0775 pqlx pqlx