Accepting request 1114438 from Application:ERP:GNUHealth:Factory

OBS-URL: https://build.opensuse.org/request/show/1114438
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mygnuhealth?expand=0&rev=8

doc_path.diff

@@ -1,14 +0,0 @@
-diff -U 3 -dHrN -- a/setup.py b/setup.py
---- a/setup.py	2021-07-08 00:55:24.000000000 +0200
-+++ b/setup.py	2021-07-08 09:44:15.828710409 +0200
-@@ -53,8 +53,8 @@
-     zip_safe=False,
-     data_files=[
-         ('share/applications', ['org.kde.mygnuhealth.desktop']),
--        ('share/doc/mygnuhealth', ['doc/mygnuhealth.rst']),
--        ('share/doc/mygnuhealth/images', glob('doc/images/*', recursive=True)),
-+        ('share/doc/packages/mygnuhealth', ['doc/mygnuhealth.rst']),
-+        ('share/doc/packages/mygnuhealth/images', glob('doc/images/*', recursive=True)),
-         ('share/metainfo', ['org.kde.mygnuhealth.metainfo.xml']),
-         ('share/icons/hicolor/scalable/apps/',
-          ['mygnuhealth/images/mygnuhealth.svg']),

mygnuhealth-1.0.5.tar.gz

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

mygnuhealth-2.0.0.tar.gz

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

mygnuhealth.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Fri Sep 29 18:39:29 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Fix single singlespec: Can't use python_subpackages rewriter
+
+-------------------------------------------------------------------
+Fri Sep 29 18:03:46 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Remove dependencies which are not used at runtime anywhere
+  * only CairoSVG is reqired for PNG charts since at least
+    pygal 1.7:
+    https://github.com/Kozea/pygal/blob/1.6.2/setup.py#L70
+  * remove-obsolete-deps.patch
+
+-------------------------------------------------------------------
+Fri Sep 29 16:31:48 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Back to singlespec for a single flavor in order to
+  use sle15_python_module_pythons
+
+-------------------------------------------------------------------
+Fri Sep 29 16:13:11 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- Fix BuildRequirements
+- Fix doc package duplicate file warning
+- Remove stray singlespec
+
+-------------------------------------------------------------------
+Wed Sep 27 15:26:22 UTC 2023 - Axel Braun <axel.braun@gmx.de>
+
+- Version 2.0.0
+  * complete rewrite based on Kivy (instead Kirigami)
+  * For Details see CHANGELOG
+  * doc_path.diff removed
+  * shebang.diff removed
+  
 -------------------------------------------------------------------
 Fri Mar 11 11:44:11 UTC 2022 - Axel Braun <axel.braun@gmx.de>
 

mygnuhealth.spec

@@ -2,7 +2,7 @@
 # spec file for package mygnuhealth
 #
 # Copyright (c) 2021 SUSE LLC
-# Copyright (c) 2020-2021 Dr. Axel Braun
+# Copyright (c) 2020-2023 Dr. Axel Braun
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,26 @@
 
 
 %define modname MyGNUHealth
-%define majorver 1
+%define majorver 2
 
 #boo#1181905
 %global __requires_exclude qmlimport\\((BloodPressure|FedLogin|GHBio|GHBol|GHPsycho|Glucose|LocalAccountManager|MoodEnergy|NetworkSettings|Osat|ProfileSettings|Weight|PoL|GHLifestyle|GHPhysicalActivity|GHNutrition|GHSleep|GHAbout)
 
+%if %{?suse_version} > 1500
+# only the primary one for TW
+%define pythons python3
+%define mypython python3
+%define mypython_sitelib %{python3_sitelib}
+%else
+# needs Python 3.9+
+%{?sle15_python_module_pythons}
+# use the one define in sle15_python_module_pythons
+%define mypython %pythons
+%define mypython_sitelib %{expand:%%%{mypython}_sitelib}
+%endif
+
 Name:           mygnuhealth
-Version:        %{majorver}.0.5
+Version:        %{majorver}.0.0
 Release:        0
 Summary:        The personal health record for the GNU Health system
 License:        GPL-3.0-or-later
@@ -33,21 +46,33 @@ URL:            http://health.gnu.org/
 Source:         https://ftp.gnu.org/gnu/health/mygnuhealth/%{name}-%{version}.tar.gz
 Source1:        https://ftp.gnu.org/gnu/health/mygnuhealth/%{name}-%{version}.tar.gz.sig
 Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring
-Patch0:         shebang.diff
+Patch0:         remove-obsolete-deps.patch
-Patch1:         doc_path.diff
+# SECTION build
 BuildRequires:  fdupes
-BuildRequires:  python3-bcrypt
+BuildRequires:  %{python_module wheel}
-BuildRequires:  python3-matplotlib
+BuildRequires:  %{python_module setuptools >= 61}
-BuildRequires:  python3-pyside2 >= 5.15
+BuildRequires:  %{python_module pip}
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-tinydb
 BuildRequires:  update-desktop-files
-Requires:       kirigami2
+BuildRequires:  python-rpm-macros
-Requires:       python3-bcrypt
+# /SECTION
-Requires:       python3-matplotlib
+# SECTION test requirements
-Requires:       python3-pyside2 >= 5.15
+# there are no tests, but at least check that all the runtime requirements are available on build time
-Requires:       python3-requests
+BuildRequires:  %{python_module bcrypt}
-Requires:       python3-tinydb
+BuildRequires:  %{python_module Kivy}
+BuildRequires:  %{python_module pygal}
+BuildRequires:  %{python_module tinydb}
+BuildRequires:  %{python_module requests}
+BuildRequires:  %{python_module CairoSVG}
+Requires:       %{mypython}-bcrypt
+Requires:       %{mypython}-Kivy
+Requires:       %{mypython}-pygal
+Requires:       %{mypython}-tinydb
+Requires:       %{mypython}-requests
+Requires:       %{mypython}-CairoSVG
+# /SECTION
+BuildArch:      noarch
+# singlespec rewriter for exactly one python (see above)
+
 
 %description
 The Personal Health Information Management System for Desktop and Mobile Devices
@@ -56,30 +81,33 @@ for the GNU Health ecosystem
 %package -n %{name}-doc
 Summary:        Documentation files for MyGNUHealth
 Group:          Productivity/Office/Management
-BuildArch:      noarch
 
 %description -n %{name}-doc
 This package includes the documentation for MyGNUHealth Personal Health
 Information Management System for Desktop and Mobile Devices
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}
-%autopatch -p1
 
 %build
-%python3_build
+%pyproject_wheel
 
 %install
-%python3_install --prefix=%{_prefix} --root=%{buildroot}
+%pyproject_install
+
+# remove shebang
+%python_expand sed -i '1{/env python/d}' %{buildroot}%{python_sitelib}/mygnuhealth/*.py
 
 # menu-entry
-desktop-file-install --dir %{buildroot}%{_datadir}/applications org.kde.mygnuhealth.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications org.gnuhealth.mygnuhealth.desktop
-%suse_update_desktop_file org.kde.mygnuhealth
+%suse_update_desktop_file org.gnuhealth.mygnuhealth
 
-#documentation in the MyGNUHealth-doc package is sufficient
+%python_expand %fdupes %{buildroot}%{python_sitelib}
-rm -rf %{buildroot}%{_docdir}/*
 
-%python_expand %fdupes %{buildroot}%{python3_sitelib}
+# install and deduplicate doc
+mkdir -p %{buildroot}%{_docdir}/%{name}-doc/
+cp -r doc/* %{buildroot}%{_docdir}/%{name}-doc/
+%fdupes %{buildroot}%{_docdir}
 
 %post
 #clean qml cache to avoid issues
@@ -91,13 +119,14 @@ rm -rf /home/*/.cache/mygnuhealth
 
 %files
 %attr(755,root,root) %{_bindir}/%{name}
-%{_datadir}/applications/org.kde.mygnuhealth.desktop
+%{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop
-%{_datadir}/icons/*
-%{_datadir}/metainfo/*
 %license COPYRIGHT LICENSE
-%{python3_sitelib}/*
+%{mypython_sitelib}/mygnuhealth
+%{mypython_sitelib}/mygnuhealth-%{version}.dist-info
+
 
 %files -n %{name}-doc
-%doc README.rst doc/*
+%doc README.rst
+%{_docdir}/*
 
 %changelog

remove-obsolete-deps.patch

@@ -0,0 +1,28 @@
+Index: mygnuhealth/buildozer.spec
+===================================================================
+--- mygnuhealth.orig/buildozer.spec
++++ mygnuhealth/buildozer.spec
+@@ -37,8 +37,8 @@ version = 1.9
+ 
+ # (list) Application requirements
+ # comma separated e.g. requirements = sqlite3,kivy
+-# pygal, cairosvg, tinycss and cssselect are to render the charts in PNG format
+-requirements = python3,kivy, tinydb, bcrypt, pygal, cairosvg, tinycss, cssselect
++# pygal, cairosvg is to render the charts in PNG format
++requirements = python3,kivy, tinydb, bcrypt, pygal, cairosvg
+ 
+ # (str) Custom source folders for requirements
+ # Sets custom source for any requirements with recipes
+Index: mygnuhealth/pyproject.toml
+===================================================================
+--- mygnuhealth.orig/pyproject.toml
++++ mygnuhealth/pyproject.toml
+@@ -18,8 +18,6 @@ dependencies = [
+     'tinydb',
+     'bcrypt',
+     'cairosvg',
+-    'tinycss', 
+-    'cssselect'
+     ]
+ 
+ classifiers=[

shebang.diff

@@ -1,45 +0,0 @@
-diff -U 3 -dHrN -- a/mygnuhealth/about.py b/mygnuhealth/about.py
---- a/mygnuhealth/about.py	2021-04-27 01:05:15.000000000 +0200
-+++ b/mygnuhealth/about.py	2021-04-29 16:37:17.525630184 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- ####################################################################
- #   Copyright (C) 2020-2021 Luis Falcon <falcon@gnuhealth.org>
- #   Copyright (C) 2020-2021 GNU Solidario <health@gnusolidario.org>
-diff -U 3 -dHrN -- a/mygnuhealth/core.py b/mygnuhealth/core.py
---- a/mygnuhealth/core.py	2021-04-19 21:56:29.000000000 +0200
-+++ b/mygnuhealth/core.py	2021-04-29 16:37:17.533630154 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- ##############################################################################
- #
- #    MyGNUHealth : Mobile and Desktop PHR node for GNU Health
-diff -U 3 -dHrN -- a/mygnuhealth/credits.py b/mygnuhealth/credits.py
---- a/mygnuhealth/credits.py	2021-04-19 21:56:29.000000000 +0200
-+++ b/mygnuhealth/credits.py	2021-04-29 16:37:17.533630154 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- ####################################################################
- #   Copyright (C) 2020-2021 Luis Falcon <falcon@gnuhealth.org>
- #   Copyright (C) 2020-2021 GNU Solidario <health@gnusolidario.org>
-diff -U 3 -dHrN -- a/mygnuhealth/mygh.py b/mygnuhealth/mygh.py
---- a/mygnuhealth/mygh.py	2021-04-19 21:56:29.000000000 +0200
-+++ b/mygnuhealth/mygh.py	2021-04-29 16:37:17.537630140 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- ##############################################################################
- #
- #    MyGNUHealth : Mobile and Desktop PHR node for GNU Health
-diff -U 3 -dHrN -- a/setup.py b/setup.py
---- a/setup.py	2021-04-18 23:56:30.000000000 +0200
-+++ b/setup.py	2021-04-29 16:37:17.549630096 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/python3
- # This file if part of the MyGNUHealth, the GNU Health PHR
- # www.gnuhealth.org
-