Accepting request 752389 from Application:ERP:GNUHealth:Factory

gnuhealth 3.6.x (forwarded request 750787 from DocB)

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

GNUHealth.README.SUSE

@@ -167,6 +167,23 @@ Starting with GNU Health 3.2, GNU Health comes with its own WebDAV-Server that c
 
 You can start multiple webdav services for different databases in parallel.
 
+Installation of the Demo-DB
+===========================
+
+GNU Health provides a demo database (same as on the demo server). To install the DB
+proceed as follows:
+
+log in as user postgres and change directory to /tmp
+> su
+> su postgres
+> cd /tmp
+
+run the installation script:
+
+> install_demo_database.sh 36
+
+The script expects the major release of GNU Health (3.6 in this case)
+
 Digital Signatures
 ==================
 
@@ -186,4 +203,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>  Wed Oct 30 11:11:20 UTC 2019
+ -- Axel Braun <axel.braun@gmx.de>  Wed Oct 30 11:11:20 UTC 2019

demo.diff

@@ -1,103 +0,0 @@
-diff --git a/scripts/demo/install_demo_database.sh b/scripts/demo/install_demo_database.sh
---- a/scripts/demo/install_demo_database.sh
-+++ b/scripts/demo/install_demo_database.sh
-@@ -1,47 +1,71 @@
- #!/usr/bin/env bash
- # Script to download/unpack and locally install the GNU Health demo database
- 
--URL="http://health.gnu.org/downloads/postgres_dumps/gnuhealth-3.0.1-demo-data.tar.gz"
--DB="gnuhealth_demo"
-+URL="https://www.gnuhealth.org/downloads/postgres_dumps/gnuhealth-$1-demo.sql.gz"
-+DB="ghdemo$1"
- 
--if [[ $USER != "gnuhealth" ]]; then
--    echo "Run script as gnuhealth user"
-+help()
-+{
-+    cat << EOF
-+
-+GNU Health HMIS demo database installer
-+
-+usage: `basename $0` <db_version>
-+
-+    Example:
-+    $ bash ./install_demo_dabase.sh 36
-+
-+    will install the latest demo db for version 3.6.x
-+EOF
-+    exit 0
-+}
-+
-+bailout () {
-+    echo "Error"
-+    echo "Cleaning up..."
-+    cleanup
-     exit 1
-+    }
-+
-+
-+if [ $# -eq 0 ]; then
-+    help
- fi
- 
-+cleanup () {
-+    rm -f gnuhealth_demo_database.sql.gz
-+    rm -f gnuhealth_demo_database.sql
-+    }
- 
--if psql -l | grep -q "$DB"; then
-+
-+if psql -l | grep -wq "$DB"; then
-     echo "$DB database already exists"
-     echo "    delete it/change target database before proceeding"
--    exit 1
-+    bailout
- fi
- 
--function cleanup {
--    rm -f demo_database.sql.gz
--    rm -f demo_database.sql
--    exit
--    }
- 
--trap cleanup SIGHUP SIGINT SIGTERM EXIT
- 
--echo -n 'Downloading the demo database...'
--wget -q "$URL" -O demo_database.sql.gz
--echo 'COMPLETE'
-+echo -n "Downloading the demo database..."
-+wget "$URL" -O gnuhealth_demo_database.sql.gz || bailout
-+echo 'SUCCESS...'
- 
--echo -n 'Unpacking the database...'
--gunzip -q demo_database.sql.gz
--echo 'COMPLETE'
-+echo -n "Unpacking the database..."
-+gunzip -q gnuhealth_demo_database.sql.gz || bailout
-+echo 'SUCCESS...'
- 
--echo -n 'Initializing empty database...'
--psql -q -d template1 -c "create database $DB encoding='unicode'"
--echo 'COMPLETE'
-+echo -n "Initializing empty database..."
-+createdb $DB
-+echo 'SUCCESS...'
- 
--echo -n 'Importing demo database...'
--psql -q "$DB" < demo_database.sql > /dev/null 2>&1
--echo 'COMPLETE'
-+echo "Importing demo database..."
-+psql -q "$DB" < gnuhealth_demo_database.sql > /dev/null 2>&1 || bailout
-+echo "IMPORT OF DEMO DATABASE $DB COMPLETED SUCCESFULLY !"
- 
--echo 'Use Tryton to access (with non-gnuhealth user!)...'
-+echo "Login Info:"
- echo "    Database: $DB"
--echo '    Username: admin'
--echo '    Password: gnusolidario'
-+echo "    Username: admin"
-+echo "    Password: gnusolidario"
- exit 0
-+
-+
-

gnuhealth-3.4.1.tar.gz

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

gnuhealth-3.6.2.tar.gz

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

gnuhealth-control

@@ -24,7 +24,7 @@
 #
 ##############################################################################
 
-VERSION="3.4.1-openSUSE"
+VERSION="3.6.2-openSUSE"
 
 TRYTON_URL="http://downloads.tryton.org"
 GNUHEALTH_URL="http://ftp.gnu.org/gnu/health"
@@ -376,7 +376,7 @@ relink_mods()
 
 #    fi
 
-    sudo systemctl restart trytond
+    sudo systemctl restart gnuhealth
 
 }
     

gnuhealth.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 21 14:40:47 UTC 2019 - Axel Braun <axel.braun@gmx.de>
+
+- version 3.6.1
+  demo.diff removed (included in 3.6.1)
+
 -------------------------------------------------------------------
 Mon Nov 11 18:22:37 UTC 2019 - Axel Braun <axel.braun@gmx.de>
 

gnuhealth.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnuhealth
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 # Copyright (c) 2014-2019 Dr. Axel Braun
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,30 +17,33 @@
 #
 
 
-%define         majorver 3.4
+%define         t_version %(rpm -q --qf '%%{VERSION}' trytond)
+%define         majorver 3.6
 Name:           gnuhealth
 
-Version:        %{majorver}.1
+Version:        %{majorver}.2
 Release:        0
 
 # List of additional build dependencies
-BuildRequires:  fdupes
+###ildRequires:  fdupes
+BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-setuptools
 
 # For the variables:
 BuildRequires:  trytond
-%define t_version %(rpm -q --qf '%%{VERSION}' trytond)
 
-Url:            http://health.gnu.org
+URL:            http://health.gnu.org
-Source0:        http://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz
+##ource0:        http://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz
-#Source:         %{name}-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.gz
 Source1:        GNUHealth.README.SUSE
 Source2:        gnuhealth-control
 Source3:        gnuhealth.service
 Source4:        gnuhealth-webdav@.service
 Source5:        openSUSE-gnuhealth-setup
 Source6:        gnuhealth
-Patch0:         demo.diff
+##atch0:         bug_57292.diff
+##atch1:         xmlfix.diff
+##atch2:         demo.diff
 
 BuildArch:      noarch
 
@@ -54,9 +57,8 @@ Requires:       python3-PyWebDAV3-GNUHealth
 Requires:       python3-caldav
 Requires:       python3-hl7apy
 Requires:       python3-ldap3
+Requires:       python3-passlib
 Requires:       python3-pyBarcode
-#Federation:
-Requires:       python3-pymongo
 Requires:       python3-qrcode
 Requires:       python3-simpleeval
 Requires:       python3-six
@@ -66,7 +68,6 @@ Requires:       trytond_account
 Requires:       trytond_account_invoice
 Requires:       trytond_account_invoice_stock
 Requires:       trytond_account_product
-#Requires:       trytond_calendar
 Requires:       trytond_company
 Requires:       trytond_country
 Requires:       trytond_currency
@@ -93,9 +94,21 @@ 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 -n %{name}-orthanc
+Summary:        Integration module for Orthanc
+Group:          Productivity/Office/Management
+Requires:       gnuhealth
+Requires:       python3-beren
+Requires:       python3-pendulum
+
+%description -n %{name}-orthanc
+This package provides the interface to Orthanc
+
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+##atch0 -p1
+##atch1 -p1
+##atch2 -p1
 cp %{S:1} .
 cp %{S:2} .
 
@@ -128,7 +141,7 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/%{name}-webdav@.service
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tryton
 
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+####ython_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %pre
 #Write environment changes to /etc/bash.bashrc.local
@@ -160,6 +173,10 @@ EOF
 %postun
 %service_del_postun gnuhealth.service
 
+%files -n %{name}-orthanc
+%{python3_sitelib}/%{name}_orthanc*
+%{python3_sitelib}/trytond/modules/health_orthanc*
+
 %files 
 %defattr(744,root,root)
 %{_bindir}/gnuhealth-control
@@ -170,6 +187,8 @@ EOF
 %defattr(-,root,root)
 %doc README Changelog gnuhealth-setup version gnuhealthrc GNUHealth.README.SUSE scripts/* backend/* config/* doc/*
 %license COPYING
+%exclude %{python3_sitelib}/%{name}_orthanc*
+%exclude %{python3_sitelib}/trytond/modules/health_orthanc*
 %{python_sitelib}/*
 
 %changelog