From 97f78db3d84f79cac1c7e14c7e02b14bde869987044242c70f06bc528d1cdc42 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Mon, 7 Mar 2022 14:18:27 +0000 Subject: [PATCH] Accepting request 959966 from Application:ERP:GNUHealth:4.0 version bump OBS-URL: https://build.opensuse.org/request/show/959966 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/gnuhealth?expand=0&rev=95 --- GNUHealth.README.openSUSE | 12 ++++++++++- gnuhealth-3.8.0.tar.gz | 3 --- gnuhealth-3.8.0.tar.gz.sig | Bin 566 -> 0 bytes gnuhealth-4.0.0.tar.gz | 3 +++ gnuhealth-4.0.0.tar.gz.sig | Bin 0 -> 566 bytes gnuhealth.changes | 34 ++++++++++++++---------------- gnuhealth.spec | 42 ++++++++++++++++++++++++++----------- reporting.diff | 20 ------------------ 8 files changed, 60 insertions(+), 54 deletions(-) delete mode 100644 gnuhealth-3.8.0.tar.gz delete mode 100644 gnuhealth-3.8.0.tar.gz.sig create mode 100644 gnuhealth-4.0.0.tar.gz create mode 100644 gnuhealth-4.0.0.tar.gz.sig delete mode 100644 reporting.diff diff --git a/GNUHealth.README.openSUSE b/GNUHealth.README.openSUSE index 246b7ae..5b21282 100644 --- a/GNUHealth.README.openSUSE +++ b/GNUHealth.README.openSUSE @@ -1,6 +1,12 @@ GNUHealth for openSUSE ====================== +Note for GNU Health 4.0 and above: +When installing GNU Health 4.0 or higher, note that dependency on postgresql-server is now 'Recommends'. +This helps keeping the installation lean when running Postgresql on a separate server. +If you are using --no-recommends for installation, you need to install postgresql-server additionally. +If you install with recommendations, postgresql-server is installed automatically. + How to get it running (Without reading the instructions) ======================================================== @@ -32,6 +38,10 @@ FOR LOCAL CONNECTIONS (Database on the same machine) change the line to local all all trust +(you can put an even higher security level by setting + local $DATABASE tryton trust +as explicit access rule for the database $DATABASE - note that only user tryton can access this!) + Save your input. This will make sure that Tryton/GNUHealth server can connect to the database 3) Create a role for 'tryton' in the database (still as user postgres) @@ -203,4 +213,4 @@ Have fun and keep the neighborhood well and fit! [4] https://github.com/mbehrle/tryton/blob/wiki/InstallationonopenSUSE.md - -- Axel Braun Wed Oct 30 11:11:20 UTC 2019 + -- Axel Braun Sun Mar 06 10:12:31 UTC 2022 diff --git a/gnuhealth-3.8.0.tar.gz b/gnuhealth-3.8.0.tar.gz deleted file mode 100644 index 3fc95ce..0000000 --- a/gnuhealth-3.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe850fa6f9251a86508a24775c7591b5507f5934639887d1984ada17c0d54e35 -size 14407853 diff --git a/gnuhealth-3.8.0.tar.gz.sig b/gnuhealth-3.8.0.tar.gz.sig deleted file mode 100644 index 0b8033c6dc2675694f7183251a032e3b869cc29be6eb819d69576478b3ca12a1..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+zzsL{Bkz*Was*T9N72&P`n30(U0$?d~761wf5Wp4T zt^k;knI*Rm|9c>`7yl8N=aqNJWzl9F){VU7hx36|vsK~-;&dBckYeyG0=%z{{r#B* zq|Hcbf#u;8$>Md?vcg2UmP5w;*(BhST6EK&n!1PSK+E`SSh4RaIzx(FNQ$2?-G2O= zO_ha~(;VZL|JSK)QkbOfm65R0Xp*@^;mOjQQc8P+-U&!w(zq4L*1k(8U?Q%y2&jef z$Ux%sbSgY&id1eW%iK9_7e-Vl!}m_S_S4` zM3zhRH|tyB7#@7GH%YGlk Ez_U{(n*aa+ diff --git a/gnuhealth-4.0.0.tar.gz b/gnuhealth-4.0.0.tar.gz new file mode 100644 index 0000000..6c54877 --- /dev/null +++ b/gnuhealth-4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86c4c3c6305e270b832308f4ca7f9ae4ef26f3b85ab12564fa4efce84f850f62 +size 137994240 diff --git a/gnuhealth-4.0.0.tar.gz.sig b/gnuhealth-4.0.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3605327d2c57d83d1a0b874390a56388ad9fe77bf08df359884ac3bd9c11c1e1 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+zzsL{Bkz*Was*T9N72&P`n30(U0%9Ze?Enf15Wp4T zt^k;knO4IP0MUS6|3f2LPQFq~;a({-vXFFp7`S*=z!E^qGRt#}$HHx@5RmDI(9GE9 z{Pd(cw1t7b=&Jgtej+7k&oOaszGIDNZRZIUl%rLd9-$bkvYWAnl^2*g?GsO&gW3 zjqwmongv?kPb+INd1~yj>eey=jGK6>6}j@{B$BxfTd0;sGEQ4Lm8xTx}Z`J3i^hdT`$7*WzsUL z=QJEfa6YkXDTDliJ2<6w7vcO%yF=ZBR1Memwl?%zJ5Mq>Ve6L%YXp>em>s|Vh( zZ+SCF;rOW{5=MG~U7kFafrEIuk0^$2r2`YjCs@6ETWPWy=tymDZdq z%Br#{HqCwm{j#y;JSCKgs@Se1HmTu9=A!&AJb7d8uaGriBj@&14#~EPzcvGRc%EvY z!B+P_09D1g4Xqd?BcVk`X*pzcZ+s>xpl9q@tR*jBD1Nbo5N5;2V9vog5EJ%3$=^UG EzNEGh4FCWD literal 0 HcmV?d00001 diff --git a/gnuhealth.changes b/gnuhealth.changes index b37946f..ead8e38 100644 --- a/gnuhealth.changes +++ b/gnuhealth.changes @@ -1,23 +1,21 @@ ------------------------------------------------------------------- -Wed Feb 16 18:26:26 UTC 2022 - Axel Braun - -- missing dependency python3-Pillow added - -------------------------------------------------------------------- -Tue Nov 16 08:37:25 UTC 2021 - Axel Braun - -- harden_gnuhealth.service.patch removed - we are not using the service from GH - reporting.diff added to catch change from .odt to .fodt - -------------------------------------------------------------------- -Mon Sep 20 14:02:25 UTC 2021 - Johannes Segitz - -- Added hardening to systemd service(s) (bsc#1181400). Added patch(es): - * harden_gnuhealth.service.patch - Modified: - * gnuhealth-webdav@.service - * gnuhealth.service +Sun Mar 6 10:01:47 UTC 2022 - Axel Braun +- version 4.0.0 + * based on Tryton 6.0 + * Improved ergonomics on the GTK client + * New HELP command that allows offline and contextualized documentation + * WebDAV and CalDAV packages are fully integrated in GH (no links) + * Weblate now holds 34 language teams! + * Removed obsoleted binary ODT (except for some charts) + * Improved integration with OpenStreetMap (OSM) + * Improved surgery and patient evaluation flows + * New health service Dx imaging package + * Update person gender list + * Add medical evaluations to health services + * Include (optional) expiration date on the person ID + * Add context field for Dx Imaging and Lab tests + ------------------------------------------------------------------- Fri Apr 16 17:16:20 UTC 2021 - Axel Braun diff --git a/gnuhealth.spec b/gnuhealth.spec index 48c9c39..52c649d 100644 --- a/gnuhealth.spec +++ b/gnuhealth.spec @@ -15,10 +15,12 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%bcond_with tests 0 - +%define skip_python2 1 %define t_version %(rpm -q --qf '%%{VERSION}' trytond) -%define majorver 3.8 +%define majorver 4.0 + Name: gnuhealth Version: %{majorver}.0 @@ -29,7 +31,7 @@ License: GPL-3.0-or-later Group: Productivity/Office/Management Source0: https://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz -##%Source0: %{name}-%{version}.tar.gz +## Source0: %{name}-%{version}.tar.gz Source1: GNUHealth.README.openSUSE Source2: gnuhealth-control Source3: gnuhealth.service @@ -40,15 +42,21 @@ Source7: gnuhealth-rpmlintrc Source8: https://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz.sig Source9: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring Patch0: shebang.diff -Patch1: reporting.diff BuildRequires: fdupes BuildRequires: python-rpm-generators -BuildRequires: python3-rpm-macros +BuildRequires: python-rpm-macros BuildRequires: python3-setuptools -# For the variables: +BuildRequires: python3-pytest +# For the tests: BuildRequires: trytond +BuildRequires: trytond_company +BuildRequires: trytond_currency +BuildRequires: trytond_party +BuildRequires: trytond_product +# new fonts for the forms: +Requires: gnu-free-fonts Requires: bsdtar Requires: proteus Requires: python3-PyWebDAV3-GNUHealth @@ -111,23 +119,22 @@ This package provides the interface to Orthanc %prep %setup -q -n %{name}-%{version} -%autopatch -p1 - +##%%patch0 -p1 cp %{S:1} . cp %{S:2} . %build for i in h*; do - cd $i + pushd $i %python3_build - cd .. + popd done %install for i in h*; do - cd $i + pushd $i %python3_install --prefix=%_prefix --root=%buildroot - cd .. + popd done mkdir -p -m 755 %{buildroot}%{_bindir} @@ -155,6 +162,17 @@ rmdir backend %python_expand %fdupes %{buildroot}%{$python_sitelib} +%if %{with tests} +%check +cd %{buildroot}%{python3_sitelib}/trytond/modules +for i in h*; do + pushd $i + %pytest -rs tests + popd +done +%endif + + %pre #Write environment changes to /etc/bash.bashrc.local cat > /etc/bash.bashrc.local << "EOF" diff --git a/reporting.diff b/reporting.diff deleted file mode 100644 index 4ec9e89..0000000 --- a/reporting.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -U 3 -dHrN a/health_reporting/health_reporting_report.xml b/health_reporting/health_reporting_report.xml ---- a/health_reporting/health_reporting_report.xml 2021-01-29 00:16:22.747730075 +0100 -+++ b/health_reporting/health_reporting_report.xml 2021-11-15 18:31:40.803718094 +0100 -@@ -5,14 +5,14 @@ - - Summary Report - gnuhealth.summary.report -- health_reporting/report/summary_report.odt -+ health_reporting/report/summary_report.fodt - pdf - - - - Epidemiological Surveillance - gnuhealth.epidemics.report -- health_reporting/report/epidemics_report.odt -+ health_reporting/report/epidemics_report.fodt - pdf - -