Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mygnuhealth for openSUSE:Factory checked in at 2023-10-01 21:22:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mygnuhealth (Old) and /work/SRC/openSUSE:Factory/.mygnuhealth.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mygnuhealth" Sun Oct 1 21:22:15 2023 rev:8 rq:1114438 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mygnuhealth/mygnuhealth.changes 2022-03-11 21:42:00.954105128 +0100 +++ /work/SRC/openSUSE:Factory/.mygnuhealth.new.28202/mygnuhealth.changes 2023-10-01 21:22:52.109866018 +0200 @@ -1,0 +2,36 @@ +Fri Sep 29 18:39:29 UTC 2023 - Ben Greiner <c...@bnavigator.de> + +- Fix single singlespec: Can't use python_subpackages rewriter + +------------------------------------------------------------------- +Fri Sep 29 18:03:46 UTC 2023 - Ben Greiner <c...@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 <c...@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 <c...@bnavigator.de> + +- Fix BuildRequirements +- Fix doc package duplicate file warning +- Remove stray singlespec + +------------------------------------------------------------------- +Wed Sep 27 15:26:22 UTC 2023 - Axel Braun <axel.br...@gmx.de> + +- Version 2.0.0 + * complete rewrite based on Kivy (instead Kirigami) + * For Details see CHANGELOG + * doc_path.diff removed + * shebang.diff removed + +------------------------------------------------------------------- Old: ---- doc_path.diff mygnuhealth-1.0.5.tar.gz mygnuhealth-1.0.5.tar.gz.sig shebang.diff New: ---- mygnuhealth-2.0.0.tar.gz mygnuhealth-2.0.0.tar.gz.sig remove-obsolete-deps.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mygnuhealth.spec ++++++ --- /var/tmp/diff_new_pack.dqWhUi/_old 2023-10-01 21:22:53.501916387 +0200 +++ /var/tmp/diff_new_pack.dqWhUi/_new 2023-10-01 21:22:53.501916387 +0200 @@ -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 @@ 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 -Patch1: doc_path.diff +Patch0: remove-obsolete-deps.patch +# SECTION build BuildRequires: fdupes -BuildRequires: python3-bcrypt -BuildRequires: python3-matplotlib -BuildRequires: python3-pyside2 >= 5.15 -BuildRequires: python3-setuptools -BuildRequires: python3-tinydb +BuildRequires: %{python_module wheel} +BuildRequires: %{python_module setuptools >= 61} +BuildRequires: %{python_module pip} BuildRequires: update-desktop-files -Requires: kirigami2 -Requires: python3-bcrypt -Requires: python3-matplotlib -Requires: python3-pyside2 >= 5.15 -Requires: python3-requests -Requires: python3-tinydb +BuildRequires: python-rpm-macros +# /SECTION +# SECTION test requirements +# there are no tests, but at least check that all the runtime requirements are available on build time +BuildRequires: %{python_module bcrypt} +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 @@ %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 -%autopatch -p1 +%autosetup -p1 -n %{name} %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 -%suse_update_desktop_file org.kde.mygnuhealth +desktop-file-install --dir %{buildroot}%{_datadir}/applications org.gnuhealth.mygnuhealth.desktop +%suse_update_desktop_file org.gnuhealth.mygnuhealth -#documentation in the MyGNUHealth-doc package is sufficient -rm -rf %{buildroot}%{_docdir}/* +%python_expand %fdupes %{buildroot}%{python_sitelib} -%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,12 +119,13 @@ %files %attr(755,root,root) %{_bindir}/%{name} -%{_datadir}/applications/org.kde.mygnuhealth.desktop -%{_datadir}/icons/* -%{_datadir}/metainfo/* +%{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop %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}/* ++++++ mygnuhealth-1.0.5.tar.gz -> mygnuhealth-2.0.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/mygnuhealth/mygnuhealth-1.0.5.tar.gz /work/SRC/openSUSE:Factory/.mygnuhealth.new.28202/mygnuhealth-2.0.0.tar.gz differ: char 5, line 1 ++++++ remove-obsolete-deps.patch ++++++ 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=[
