Accepting request 1326529 from Application:ERP:GNUHealth:Factory

bugfix version

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

gnuhealth-his-server-5.0-bundle-2025.1.tar.gz

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

gnuhealth-his-server-patchset-5.0.5-bundle.tar.gz

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

gnuhealth.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Jan  9 14:58:36 UTC 2026 - Axel Braun <axel.braun@gmx.de>
+
+- version 5.0.5
+  * optimizations to language files
+  * various fixes
+  * install_demo_database.sh added
+
+-------------------------------------------------------------------
+Sun Sep 14 13:28:24 UTC 2025 - Axel Braun <axel.braun@gmx.de>
+
+- version 5.0.2
+  * inconsistent naming of package and directories, switch to local copy
+  * gnuhealth.keyring removed due to local copy
+  * Remove unused dependencies from health module
+  * Wrong cursor field teeth (dentistry module)
+  * remove pillow dependency from lab and dentistry 
+
 -------------------------------------------------------------------
 Tue Jul  1 08:40:05 UTC 2025 - Axel Braun <axel.braun@gmx.de>
 

gnuhealth.keyring

@@ -1,98 +0,0 @@
-Member GPG keyring of health group.
-
-Note that this keyring is not intended for checking releases of that group.
-Use Group Release Keyring instead.
-
-GPG keys of Luis Falcon <meanmicio>
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-wgeqPuoNWoFYKK0/GlVa
-=doah
------END PGP PUBLIC KEY BLOCK-----

gnuhealth.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package gnuhealth
 #
-# Copyright (c) 2025 SUSE LLC
-# Copyright (c) 2014-2025 Dr. Axel Braun
+# Copyright (c) 2026 SUSE LLC and contributors
+# Copyright (c) 2014-2026 Dr. Axel Braun
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,15 +30,16 @@
 
 Name:           gnuhealth
 
-Version:        %{majorver}.0
+Version:        %{majorver}.5
 Release:        0
 URL:            https://health.gnu.org
 Summary:        A Health and Hospital Information System
 License:        GPL-3.0-or-later
 Group:          Productivity/Office/Management
 
-Source0:        https://ftp.gnu.org/gnu/health/%{name}-his-server-%{majorver}-bundle-2025.1.tar.gz
-##%Source0:        %{name}-%{version}.tar.gz
+# As directory naming is inconsistent we use a local download
+## %Source0:        https://ftp.gnu.org/gnu/health/%{name}-his-server-patchset-%{version}-bundle.tar.gz
+Source0:        %{name}-his-server-patchset-%{version}-bundle.tar.gz
 Source1:        GNUHealth.README.openSUSE
 Source2:        gnuhealth-control
 Source3:        gnuhealth.service
@@ -46,8 +47,9 @@ Source4:        gnuhealth-webdav@.service
 Source5:        openSUSE-gnuhealth-setup
 Source6:        gnuhealth
 Source7:        gnuhealth-rpmlintrc
-Source8:        https://ftp.gnu.org/gnu/health/%{name}-his-server-%{majorver}-bundle-2025.1.tar.gz.sig
-Source9:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring
+Source8:        install_demo_database.sh
+## Source8:        https://ftp.gnu.org/gnu/health/%{name}-his-server-patchset-%{version}-bundle.tar.gz.sig
+## Source9:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring
 
 ##% BuildRequires:  %{python_module pytest}
 BuildRequires:  %{mypython}-pip
@@ -68,7 +70,7 @@ BuildRequires:  trytond_product >= 7.0
 
 # new fonts for the forms:
 Requires:       gnu-free-fonts
-Requires:       %{mypython}-Pillow >= 11.1.0
+Requires:       %{mypython}-Pillow
 Requires:       %{mypython}-PyWebDAV3-GNUHealth
 Requires:       %{mypython}-Werkzeug >= 3.1.3
 Requires:       %{mypython}-bcrypt
@@ -138,7 +140,7 @@ Requires:       gnuhealth
 This package provides the interface to Orthanc and the imaging worklist
 
 %prep
-%autosetup -n %{name}-his-%{majorver}-bundle-2025.1
+%autosetup -n %{name}-his-server-patchset-%{version}-bundle
 ##%%patch -P 0 -p1
 cp %{S:1} .
 cp %{S:2} .
@@ -166,8 +168,7 @@ install -p -m 755 gnuhealth-control %{buildroot}%{_bindir}/gnuhealth-control
 install -p -m 755 %{S:5} %{buildroot}%{_bindir}/openSUSE-gnuhealth-setup
 install -p -m 755 %{S:6} %{buildroot}%{_bindir}/gnuhealth
 install -p -m 755 health_webdav3_server/bin/gnuhealth-webdav-server %{buildroot}%{_bindir}/gnuhealth-webdav-server
-#5.0A1 change:
-#%%install -p -m 755 scripts/demodb/install_demo_database.sh %{buildroot}%{_bindir}/install_demo_database.sh
+install -p -m 755 %{S:8} %{buildroot}%{_bindir}/install_demo_database.sh
 
 #delete empty demo directory
 rm -rf scripts/demodb
@@ -244,6 +245,7 @@ EOF
 %{_bindir}/gnuhealth-control
 %{_bindir}/gnuhealth-webdav-server
 %{_bindir}/openSUSE-gnuhealth-setup
+%{_bindir}/install_demo_database.sh
 #5.0A1 change:
 #%%{_bindir}/install_demo_database.sh
 %{_unitdir}/%{name}.service

install_demo_database.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+# SPDX-FileCopyrightText: 2008-2022 Luis Falcón <falcon@gnuhealth.org>
+# SPDX-FileCopyrightText: 2011-2022 GNU Solidario <health@gnusolidario.org>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#########################################################################
+#   Hospital Management Information System (HMIS) component of the      #
+#                       GNU Health project                              #
+#                   https://www.gnuhealth.org                           #
+#########################################################################
+#                      install_demo_database.sh                         #
+#        Downloads and installs the GNU Health demo database            #
+#########################################################################
+
+
+
+URL="https://www.gnuhealth.org/downloads/postgres_dumps/gnuhealth-$1-demo.sql.gz"
+DB="ghdemo$1"
+
+help()
+{
+    cat << EOF
+
+GNU Health HMIS demo database installer
+
+usage: `basename $0` <db_version>
+
+    Example:
+    $ bash ./install_demo_dabase.sh 40
+
+    will install the latest demo db for version 4.0.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-$1.sql.gz
+    rm -f gnuhealth_demo_database-$1.sql
+    }
+
+
+if psql -l | grep -wq "$DB"; then
+    echo "$DB database already exists"
+    echo "    delete it/change target database before proceeding"
+    bailout
+fi
+
+
+
+echo -n "Downloading the demo database..."
+wget "$URL" -O gnuhealth_demo_database-$1.sql.gz || bailout
+echo 'SUCCESS...'
+
+echo -n "Unpacking the database..."
+gunzip -q gnuhealth_demo_database-$1.sql.gz || bailout
+echo 'SUCCESS...'
+
+echo -n "Initializing empty database..."
+createdb $DB
+echo 'SUCCESS...'
+
+echo "Importing demo database..."
+psql -q "$DB" < gnuhealth_demo_database-$1.sql > /dev/null 2>&1 || bailout
+echo "IMPORT OF DEMO DATABASE $DB COMPLETED SUCCESFULLY !"
+
+echo "Login Info:"
+echo "    Database: $DB"
+echo "    Username: admin"
+echo "    Password: gnusolidario"
+echo "**  IMPORTANT: Check that the GNUHealth kernel matches this demo DB"
+exit 0
+
+