From f53da50fc59506dc9a31b4db1a2df197865a517ed4cb991f15cb28258f68af26 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 28 Dec 2018 14:01:07 +0000 Subject: [PATCH] Accepting request 661783 from Application:ERP:GNUHealth:3.4 - 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/661783 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/gnuhealth?expand=0&rev=26 --- GNUHealth.README.SUSE | 2 +- gnuhealth-3.2.10.tar.gz | 3 --- gnuhealth-3.4.0.tar.gz | 3 +++ gnuhealth-control | 2 +- gnuhealth.changes | 15 ++++++++++++ gnuhealth.service | 3 +++ gnuhealth.spec | 50 +++++++++++++++++++++++++--------------- openSUSE-gnuhealth-setup | 7 ++++-- 8 files changed, 59 insertions(+), 26 deletions(-) delete mode 100644 gnuhealth-3.2.10.tar.gz create mode 100644 gnuhealth-3.4.0.tar.gz diff --git a/GNUHealth.README.SUSE b/GNUHealth.README.SUSE index 74ddc7a..679d7a9 100644 --- a/GNUHealth.README.SUSE +++ b/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 THU Sep 14 19:14:04 UTC 2017 + -- Axel Braun Fri Dec 7 18:21:20 UTC 2018 diff --git a/gnuhealth-3.2.10.tar.gz b/gnuhealth-3.2.10.tar.gz deleted file mode 100644 index cfe35fa..0000000 --- a/gnuhealth-3.2.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe3c4336ea2198279531d994b94c31e07c90f2db7ca9d690ec1272eae9863541 -size 10209204 diff --git a/gnuhealth-3.4.0.tar.gz b/gnuhealth-3.4.0.tar.gz new file mode 100644 index 0000000..783a9f2 --- /dev/null +++ b/gnuhealth-3.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b981c2f7354803f60f80ac69555873e0035d0c05443fc46dbcb65fa1ef82044 +size 10367891 diff --git a/gnuhealth-control b/gnuhealth-control index 1731cd9..ae96b3f 100644 --- a/gnuhealth-control +++ b/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" diff --git a/gnuhealth.changes b/gnuhealth.changes index bbb1afd..94b6dc0 100644 --- a/gnuhealth.changes +++ b/gnuhealth.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Dec 7 18:21:20 UTC 2018 - Axel Braun + +- 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 diff --git a/gnuhealth.service b/gnuhealth.service index abe0cf5..d41b4bb 100644 --- a/gnuhealth.service +++ b/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 diff --git a/gnuhealth.spec b/gnuhealth.spec index 7c3bd93..31bccc7 100644 --- a/gnuhealth.spec +++ b/gnuhealth.spec @@ -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 -Release: 0 +# For the variables: +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,6 +91,11 @@ 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 +#%package federation +#Summary: The Federation Server of the GNU Health Package +#Group: Productivity/Office/Management +#Requires: python3-pymongo + %prep %setup -q -n %{name}-%{version} @@ -100,11 +109,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 +116,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 +126,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 +141,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 @@ -153,6 +160,10 @@ EOF %postun %service_del_postun gnuhealth.service +#%files federation +#%defattr(-,root,root) +#%{python_sitelib}/gnuhealth-federation/* + %files %defattr(744,root,root) %{_bindir}/gnuhealth-control @@ -160,7 +171,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 diff --git a/openSUSE-gnuhealth-setup b/openSUSE-gnuhealth-setup index 5ce84f0..e26942f 100644 --- a/openSUSE-gnuhealth-setup +++ b/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"