Update to 3.0.5-1

2 files changed, 32 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 268f73b92721..972b21400158 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 # Generated by mksrcinfo v8
-# Wed Nov  2 14:06:15 UTC 2016
+# Mon Jan 23 21:01:31 UTC 2017
 pkgbase = gnuhealth
-	pkgdesc = A free Health and Hospital Information System
-	pkgver = 3.0.4
+	pkgdesc = A Free Health and Hospital Information System
+	pkgver = 3.0.5
 	pkgrel = 1
 	url = http://health.gnu.org/
 	arch = any
 	license = GPL3
 	depends = postgresql
 	depends = pygtk
+	depends = python2-caldav
 	depends = python2-dateutil
 	depends = python2-ldap
 	depends = python2-pillow
@@ -18,14 +19,15 @@ pkgbase = gnuhealth
 	depends = python2-pywebdav
 	depends = python2-qrcode
 	depends = python2-vobject
-	depends = trytond>=4.0
-	depends = trytond-account-invoice>=4.0
-	depends = trytond-calendar>=4.0
-	depends = trytond-country>=4.0
-	depends = trytond-stock-lot>=4.0
-	source = http://ftp.gnu.org/gnu/health/gnuhealth-3.0.4.tar.gz
-	source = http://ftp.gnu.org/gnu/health/gnuhealth-3.0.4.tar.gz.sig
-	sha512sums = 09747578cdd565d18e353caa6c83b2a174c2c752af88d1b46de785de9ed72ef8056a116b5531c592509759ab1dd67f694032bf3feaafeaea6ef3c15b591501ad
+	depends = trytond>=4.2
+	depends = trytond-calendar>=4.2
+	depends = trytond-currency>=4.2
+	depends = trytond-product>=4.2
+	depends = trytond-stock-lot>=4.2
+	depends = trytond-stock-supply>=4.2
+	source = http://ftp.gnu.org/gnu/health/gnuhealth-3.0.5.tar.gz
+	source = http://ftp.gnu.org/gnu/health/gnuhealth-3.0.5.tar.gz.sig
+	sha512sums = cc7d96b30f0f8667040cf0230686b3fb86799f77655383152f2fb698ea0d969555c5eb1adedd47f476c16126bfe11199721ae0e752fd3d6db261505058bff94d
 	sha512sums = SKIP
 
 pkgname = gnuhealth
diff --git a/PKGBUILD b/PKGBUILD
index f255f94db638..871e849e97ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,40 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor (Arch): SpepS <dreamspepser at yahoo dot it>
 # Contributor (Arch): Ander <anderraso@gmail.com>
 
 pkgname=gnuhealth
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=1
-pkgdesc="A free Health and Hospital Information System"
+pkgdesc="A Free Health and Hospital Information System"
 arch=(any)
 url=http://health.gnu.org/
 license=(GPL3)
-depends=(
-          postgresql
-          pygtk
-          python2-dateutil
-          python2-ldap 
-          python2-pillow
-          python2-pip
-          python2-psycopg2
-          python2-pytz
-          python2-pywebdav
-          python2-qrcode 
-          python2-vobject
-          "trytond>=4.0"
-          "trytond-account-invoice>=4.0"
-          "trytond-calendar>=4.0"
-          "trytond-country>=4.0"
-          "trytond-stock-lot>=4.0"
-)
-source=(
-  http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz
-  http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz.sig
-)
-sha512sums=(
-  09747578cdd565d18e353caa6c83b2a174c2c752af88d1b46de785de9ed72ef8056a116b5531c592509759ab1dd67f694032bf3feaafeaea6ef3c15b591501ad
-  SKIP
-)
-validpgpkeys=(
-  14C7FD1362749706D602FBE2EADA01E3E44B8011 # Luis Falcon (meanmicio at GNU) <falcon@gnu.org>
-)
+depends=(postgresql pygtk python2-caldav python2-dateutil python2-ldap python2-pillow python2-pip python2-psycopg2 python2-pytz python2-pywebdav
+         python2-qrcode python2-vobject "trytond>=4.2" "trytond-calendar>=4.2" "trytond-currency>=4.2" "trytond-product>=4.2" "trytond-stock-lot>=4.2"
+         "trytond-stock-supply>=4.2")
+source=(http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz{,.sig})
+sha512sums=(cc7d96b30f0f8667040cf0230686b3fb86799f77655383152f2fb698ea0d969555c5eb1adedd47f476c16126bfe11199721ae0e752fd3d6db261505058bff94d
+            SKIP)
+validpgpkeys=(14C7FD1362749706D602FBE2EADA01E3E44B8011) # Luis Falcon (meanmicio at GNU) <falcon@gnu.org>
 
 prepare() {
+  cd $srcdir/$pkgname-$pkgver
+
   # fix python2 problem
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' $(grep -rlI '/usr/bin/env python')
 }
 
 package() {
-  # build gnuhealth modules
-    for module in health*
-    do
-      cd $srcdir/$pkgname-$pkgver/$module
-      python2 setup.py install --root=$pkgdir
-    done
+  cd $srcdir/$pkgname-$pkgver
 
   # put gnuhealth manual to man folder
-    cd "$srcdir/$pkgname-$pkgver"
-
     install -Dm644 health/man/$pkgname.1 \
       $pkgdir/usr/share/man/man1/$pkgname.1
+
+  # build gnuhealth modules
+    for module in $(ls -1 | grep '^health*'); do
+      cd $srcdir/$pkgname-$pkgver/$module
+      python2 setup.py install --root=$pkgdir
+    done
 }