- harden_gnuhealth.service.patch removed - we are not using the service from GH

reporting.diff added to catch change from .odt to .fodt

OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/gnuhealth?expand=0&rev=90

gnuhealth.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 16 08:37:25 UTC 2021 - Axel Braun <axel.braun@gmx.de>
+
+- 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 <jsegitz@suse.com>
 

gnuhealth.spec

@@ -40,7 +40,7 @@ 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:	harden_gnuhealth.service.patch
+Patch1:         reporting.diff
 
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-generators
@@ -110,10 +110,10 @@ This package provides the interface to Orthanc
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+%autopatch -p1
+
 cp %{S:1} .
 cp %{S:2} .
-%patch1 -p1
 
 %build
 for i in h*; do

harden_gnuhealth.service.patch

@@ -1,24 +0,0 @@
-Index: gnuhealth-3.8.0/scripts/startup/gnuhealth.service
-===================================================================
---- gnuhealth-3.8.0.orig/scripts/startup/gnuhealth.service
-+++ gnuhealth-3.8.0/scripts/startup/gnuhealth.service
-@@ -3,6 +3,19 @@ Description=GNU Health Server
- After=network.target
- 
- [Service]
-+# added automatically, for details please see
-+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
-+ProtectSystem=full
-+ProtectHome=true
-+PrivateDevices=true
-+ProtectHostname=true
-+ProtectClock=true
-+ProtectKernelTunables=true
-+ProtectKernelModules=true
-+ProtectKernelLogs=true
-+ProtectControlGroups=true
-+RestrictRealtime=true
-+# end of automatic additions 
- Type=simple
- User=gnuhealth
- WorkingDirectory=/home/gnuhealth

reporting.diff

@@ -0,0 +1,20 @@
+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 @@
+         <record model="ir.action.report" id="report_summary_information">
+             <field name="name">Summary Report</field>
+             <field name="report_name">gnuhealth.summary.report</field>
+-            <field name="report">health_reporting/report/summary_report.odt</field>
++            <field name="report">health_reporting/report/summary_report.fodt</field>
+             <field name="extension">pdf</field>
+         </record>
+ 
+         <record model="ir.action.report" id="report_epidemics_information">
+             <field name="name">Epidemiological Surveillance</field>
+             <field name="report_name">gnuhealth.epidemics.report</field>
+-            <field name="report">health_reporting/report/epidemics_report.odt</field>
++            <field name="report">health_reporting/report/epidemics_report.fodt</field>
+             <field name="extension">pdf</field>
+         </record>
+ 

webdav.diff

@@ -0,0 +1,60 @@
+diff -U 3 -dHrN -- a/health_caldav/setup.py b/health_caldav/setup.py
+--- a/health_caldav/setup.py	2021-01-29 00:16:22.579731378 +0100
++++ b/health_caldav/setup.py	2021-04-28 19:09:21.063707816 +0200
+@@ -47,13 +47,13 @@
+     url='https://www.gnuhealth.org',
+     download_url='http://ftp.gnu.org/gnu/health/',
+     keywords='GNUHealth calendar caldav',
+-    package_dir={'trytond.modules.calendar': '.'},
++    package_dir={'trytond.modules.health_caldav': '.'},
+     packages=[
+-        'trytond.modules.calendar',
+-        'trytond.modules.calendar.tests',
++        'trytond.modules.health_caldav',
++        'trytond.modules.health_caldav.tests',
+         ],
+     package_data={
+-        'trytond.modules.calendar': (info.get('xml', [])
++        'trytond.modules.health_caldav': (info.get('xml', [])
+             + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
+         },
+     classifiers=[
+@@ -79,7 +79,7 @@
+     zip_safe=False,
+     entry_points="""
+     [trytond.modules]
+-    calendar = trytond.modules.calendar
++    calendar = trytond.modules.health_caldav
+     """,
+     test_suite='tests',
+     test_loader='trytond.test_loader:Loader',
+diff -U 3 -dHrN -- a/health_webdav3_server/setup.py b/health_webdav3_server/setup.py
+--- a/health_webdav3_server/setup.py	2021-02-14 01:56:43.480016164 +0100
++++ b/health_webdav3_server/setup.py	2021-04-28 15:15:55.966534040 +0200
+@@ -63,13 +63,13 @@
+     url='https://www.gnuhealth.org',
+     download_url='http://ftp.gnu.org/gnu/health/',
+     keywords='webdav GNUHealth',
+-    package_dir={'trytond.modules.webdav': '.'},
++    package_dir={'trytond.modules.gnuhealth_webdav3_server': '.'},
+     packages=[
+-        'trytond.modules.webdav',
+-        'trytond.modules.webdav.tests',
++        'trytond.modules.gnuhealth_webdav3_server',
++        'trytond.modules.gnuhealth_webdav3_server.tests',
+         ],
+     package_data={
+-        'trytond.modules.webdav': (info.get('xml', [])
++        'trytond.modules.gnuhealth_webdav3_server': (info.get('xml', [])
+             + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
+                 'icons/*.svg', 'tests/*.rst']),
+         },
+@@ -93,7 +93,7 @@
+     zip_safe=False,
+     entry_points="""
+     [trytond.modules]
+-    webdav = trytond.modules.webdav
++    webdav = trytond.modules.gnuhealth_webdav3_server
+     """,
+     test_suite='tests',
+     test_loader='trytond.test_loader:Loader',