Accepting request 662672 from Application:ERP:GNUHealth:Factory

- gnuhealth-webdav service adapted to new GH webdav server
- New version 3.4.0
  * The GNU Health Federation model
  * Thalamus message server
  * New Health Information System (on MongoDB)
  * Person Master Index
  * MongoDB support (on the HIS)
  * Updated UniprotKB database with over 30K protein natural variants
  * Contextualized information on genetics and social determinants
  * Genetic and family history and environmental factors integrated to
    the Page of Life and Federation The GNU Health Book of Life
  * Tryton 4.6 integration on the HMIS node

OBS-URL: https://build.opensuse.org/request/show/662672
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuhealth?expand=0&rev=30

GNUHealth.README.SUSE

@@ -185,4 +185,4 @@ Have fun and keep the neighborhood well and fit!
 [4] https://github.com/mbehrle/tryton/blob/wiki/InstallationonopenSUSE.md
 
 
- -- Axel Braun <axel.braun@gmx.de>  THU Sep 14 19:14:04 UTC 2017
+ -- Axel Braun <axel.braun@gmx.de>  Fri Dec  7 18:21:20 UTC 2018

_service

@@ -1,3 +1,4 @@
 <services>
- <service name="download_files" mode="localonly"/>
+  
+<service name="download_files" mode="localonly" />
 </services>

gnuhealth-3.2.10.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe3c4336ea2198279531d994b94c31e07c90f2db7ca9d690ec1272eae9863541
-size 10209204

gnuhealth-3.4.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b981c2f7354803f60f80ac69555873e0035d0c05443fc46dbcb65fa1ef82044
+size 10367891

gnuhealth-control

@@ -24,7 +24,7 @@
 #
 ##############################################################################
 
-VERSION="3.2.4-openSUSE"
+VERSION="3.4.0-openSUSE"
 
 TRYTON_URL="http://downloads.tryton.org"
 GNUHEALTH_URL="http://ftp.gnu.org/gnu/health"

gnuhealth-webdav@.service

@@ -9,7 +9,7 @@ User=tryton
 Group=tryton
 PIDFile=/var/lib/trytond/gnuhealth-webdav.pid
 
-ExecStart=/usr/bin/trytond-webdav -c /etc/tryton/trytond.conf -d %I -v
+ExecStart=/usr/bin/gnuhealth-webdav-server -c /etc/tryton/trytond.conf -d %I -v
 
 # Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec=300

gnuhealth.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sat Dec 29 16:40:16 UTC 2018 - Axel Braun <axel.braun@gmx.de>
+
+- gnuhealth-webdav service adapted to new GH webdav server
+
+-------------------------------------------------------------------
+Fri Dec  7 18:21:20 UTC 2018 - Axel Braun <axel.braun@gmx.de>
+
+- New version 3.4.0
+  * The GNU Health Federation model
+  * Thalamus message server
+  * New Health Information System (on MongoDB)
+  * Person Master Index
+  * MongoDB support (on the HIS)
+  * Updated UniprotKB database with over 30K protein natural variants
+  * Contextualized information on genetics and social determinants
+  * Genetic and family history and environmental factors integrated to
+    the Page of Life and Federation The GNU Health Book of Life
+  * Tryton 4.6 integration on the HMIS node
+
 -------------------------------------------------------------------
 Thu Nov 15 09:28:38 UTC 2018 - Axel Braun <axel.braun@gmx.de>
 

gnuhealth.service

@@ -18,5 +18,8 @@ TimeoutSec=300
 # We rely on systemd to restart trytond if it dies
 Restart=always
 
+#Set the environment variables that GNU Health needs
+EnvironmentFile=/etc/tryton/gnuhealthrc
+
 [Install]
 WantedBy=multi-user.target

gnuhealth.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnuhealth
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2014-2018 Dr. Axel Braun
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,18 +17,22 @@
 #
 
 
-%define 		majorver 3.2
+%define         majorver 3.4
 Name:           gnuhealth
 
+Version:        %{majorver}.0
+Release:        0
+
 # List of additional build dependencies
 BuildRequires:  fdupes
 BuildRequires:  python3-setuptools
 
-Version:        %{majorver}.10
+# For the variables:
-Release:        0
+BuildRequires:  trytond
+%define t_version %(rpm -q --qf '%%{VERSION}' trytond)
 
 Url:            http://health.gnu.org
-Source:         http://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz
+Source0:        http://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz
 #Source:         %{name}-%{version}.tar.gz
 Source1:        GNUHealth.README.SUSE
 Source2:        gnuhealth-control
@@ -46,11 +50,11 @@ Group:          Productivity/Office/Management
 Requires:       proteus
 Requires:       python3-PyWebDAV3-GNUHealth
 Requires:       python3-caldav
-Requires:       python3-cracklib
 Requires:       python3-hl7apy
 Requires:       python3-ldap3
-Requires:       python3-polib
 Requires:       python3-pyBarcode
+#Federation:
+Requires:       python3-pymongo
 Requires:       python3-qrcode
 Requires:       python3-simpleeval
 Requires:       python3-six
@@ -60,7 +64,7 @@ Requires:       trytond_account
 Requires:       trytond_account_invoice
 Requires:       trytond_account_invoice_stock
 Requires:       trytond_account_product
-Requires:       trytond_calendar
+#Requires:       trytond_calendar
 Requires:       trytond_company
 Requires:       trytond_country
 Requires:       trytond_currency
@@ -87,7 +91,6 @@ the implementations and trainings.
 This is the server component of GNU Health. 
 You would need the GNU Health Client as well, on the same or a different machine. You may use the Tryton Client either
 
-
 %prep
 %setup -q -n %{name}-%{version}
 #%patch0 -p1
@@ -100,11 +103,6 @@ for i in h*; do
   python3 setup.py build
   cd ..
 done
-for i in try*; do
-  cd $i
-  python3 setup.py build
-  cd ..
-done
 
 %install
 for i in h*; do
@@ -112,11 +110,6 @@ for i in h*; do
   python3 setup.py install --prefix=%_prefix --root=%buildroot 
   cd ..
 done
-for i in try*; do
-  cd $i
-    python3 setup.py install --prefix=%_prefix --root=%buildroot 
-  cd ..
-done
 
 mkdir -p -m 755 %{buildroot}%{_bindir}
 install -p -m 755 gnuhealth-control %{buildroot}%{_bindir}/gnuhealth-control
@@ -127,7 +120,9 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}-webdav@.service
 
-%fdupes -s %{buildroot}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tryton
+
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %pre
 #Write environment changes to /etc/bash.bashrc.local
@@ -140,6 +135,12 @@ alias editconf='${EDITOR} /etc/tryton/trytond.conf'
 alias cdutil='cd /usr/bin'
 EOF
 
+#Write GH Variable /etc/tryton/gnuhealthrc 
+cat > /etc/tryton/gnuhealthrc << "EOF"
+GNUHEALTH_VERSION=%{version}
+TRYTON_VERSION=%{t_version}
+EOF
+
 %service_add_pre gnuhealth.service
 %service_add_pre gnuhealth-webdav@.service
 
@@ -160,7 +161,8 @@ EOF
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}-webdav@.service
 %defattr(-,root,root)
-%doc README Changelog COPYING gnuhealth-setup version gnuhealthrc GNUHealth.README.SUSE scripts/* backend/* config/* doc/*
+%doc README Changelog gnuhealth-setup version gnuhealthrc GNUHealth.README.SUSE scripts/* backend/* config/* doc/*
+%license COPYING
 %{python_sitelib}/*
 
 %changelog

openSUSE-gnuhealth-setup

@@ -32,13 +32,13 @@
 # V 0.2  20180617 Axel Replace tryton with ${DB_USER}
 # V 0.3  20180712 Axel Set user 'tryton' to superuser (otherwise installation of DEMO-DB fails)
 # V 0.32 20180720 Axel Warning for production use added
-
+# V 0.33 20181123 Axel Start gnuhealth server at the end of procedure
 #-----------------------------------------------------------------------------
 # Variables declaration
 #-----------------------------------------------------------------------------
 
 #GNU Health installer for openSUSE version
-VERSION="0.31"
+VERSION="0.33"
 
 # Colors constants
 NONE="$(tput sgr0)"
@@ -167,6 +167,9 @@ echo "Enabling GNU Health at boot time"
 systemctl enable postgresql
 systemctl enable gnuhealth
 
+# ...and start gnuhealth in that case
+systemctl start gnuhealth
+
 fi
 
 echo "All done"