From 1c287a3d276e4e959726adb9e60fd36e24d28cd7c45fe31ac742d1321ab163a7 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 22 Sep 2023 02:52:29 +0000 Subject: [PATCH 1/8] Accepting request 1112905 from home:DocB:branches:Application:ERP:GNUHealth:Factory - MyGNUHealth 1.9a5 * complete rewrite based on Kivy (instead Kirigami) * For Details see CHANGELOG OBS-URL: https://build.opensuse.org/request/show/1112905 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=28 --- mygnuhealth-1.0.5.tar.gz | 3 --- mygnuhealth-1.0.5.tar.gz.sig | Bin 566 -> 0 bytes mygnuhealth-1.9a5.tar.gz | 3 +++ mygnuhealth.changes | 7 ++++++ mygnuhealth.spec | 45 +++++++++++++++++++---------------- 5 files changed, 35 insertions(+), 23 deletions(-) delete mode 100644 mygnuhealth-1.0.5.tar.gz delete mode 100644 mygnuhealth-1.0.5.tar.gz.sig create mode 100644 mygnuhealth-1.9a5.tar.gz diff --git a/mygnuhealth-1.0.5.tar.gz b/mygnuhealth-1.0.5.tar.gz deleted file mode 100644 index 6886017..0000000 --- a/mygnuhealth-1.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a186b02b71371a5c7c18237af3ec623f8539afdead04cc5096ece8b1f29bcc7 -size 13360040 diff --git a/mygnuhealth-1.0.5.tar.gz.sig b/mygnuhealth-1.0.5.tar.gz.sig deleted file mode 100644 index a670bb3c6c7b3907141ba227f1d0748b3877fb9f9ad8ad95304002f1b0d427bf..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+zzsL{Bkz*Was*T9N72&P`n30(U0%2{rbpQ$p5Wp4T zt^k;knfR3u0OM*@;mA5ML3Z;r6XCJxQ|kH&C{$|FXn0d@=k;UtI^x3``Ku^jZJRQD z{&91uO5x^#8ADD!T-Uo#%*6Z>+wqd|(W)ho>I^aW;o8&ym>LAMeC?YJrZCVS>ilo4 z`Kg3kpDL1`1Y*dG{bsjQ-cTvw6ry$#Oc9}PBrR#dK(@k5ikK)-I2Ul6H80h`I{^7Dp{7DB*D!0%-@n(TjxC*;=Hgf zj~108ybDQp=V1ZoL848;CAZVNf;7hgQUslrkjZIqObNYaV%R`x`;E4aD16^rwpH;H zGvw1G{kh(TTMez8_RS@ zyPw(z$7ESPd;s>W3C5(;yJ^a27>@(>W0Q?FR$+P7yDamXf!pFm6RtZLOU%Q9acup9 zE7b<9@6YwOeXjs2T8^BH7fF*M*#c#+DV?_`VTPJk& E>I7LAjQ{`u diff --git a/mygnuhealth-1.9a5.tar.gz b/mygnuhealth-1.9a5.tar.gz new file mode 100644 index 0000000..b3adbdc --- /dev/null +++ b/mygnuhealth-1.9a5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68978b69d15e40a3e6a5cfcb68fff3a8720016f6b445d0b885aba442f38e0d73 +size 13839341 diff --git a/mygnuhealth.changes b/mygnuhealth.changes index a61fa9d..9e71ad3 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 21 15:24:00 UTC 2023 - Axel Braun + +- MyGNUHealth 1.9a5 + * complete rewrite based on Kivy (instead Kirigami) + * For Details see CHANGELOG + ------------------------------------------------------------------- Fri Mar 11 11:44:11 UTC 2022 - Axel Braun diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 551f830..b6ef547 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -24,28 +24,32 @@ %global __requires_exclude qmlimport\\((BloodPressure|FedLogin|GHBio|GHBol|GHPsycho|Glucose|LocalAccountManager|MoodEnergy|NetworkSettings|Osat|ProfileSettings|Weight|PoL|GHLifestyle|GHPhysicalActivity|GHNutrition|GHSleep|GHAbout) Name: mygnuhealth -Version: %{majorver}.0.5 +Version: %{majorver}.9a5 Release: 0 Summary: The personal health record for the GNU Health system License: GPL-3.0-or-later Group: Productivity/Office/Management 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 -Patch1: doc_path.diff +##Source: https://ftp.gnu.org/gnu/health/mygnuhealth/%{name}-%{version}.tar.gz +Source: %{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 BuildRequires: fdupes BuildRequires: python3-bcrypt -BuildRequires: python3-matplotlib -BuildRequires: python3-pyside2 >= 5.15 -BuildRequires: python3-setuptools +## BuildRequires: python3-matplotlib +BuildRequires: python3-Kivy +BuildRequires: python3-pygal +BuildRequires: python3-pip +BuildRequires: python3-pip-wheel +BuildRequires: python3-setuptools-wheel BuildRequires: python3-tinydb +BuildRequires: python3-wheel BuildRequires: update-desktop-files -Requires: kirigami2 +Requires: python3-Kivy Requires: python3-bcrypt -Requires: python3-matplotlib -Requires: python3-pyside2 >= 5.15 +## Requires: python3-matplotlib Requires: python3-requests Requires: python3-tinydb @@ -64,17 +68,18 @@ Information Management System for Desktop and Mobile Devices %prep %setup -q -%autopatch -p1 +## %autopatch -p1 %build -%python3_build +%pyproject_wheel %install -%python3_install --prefix=%{_prefix} --root=%{buildroot} +%pyproject_install +## --prefix=%{_prefix} --root=%{buildroot} # 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}/* @@ -91,9 +96,9 @@ rm -rf /home/*/.cache/mygnuhealth %files %attr(755,root,root) %{_bindir}/%{name} -%{_datadir}/applications/org.kde.mygnuhealth.desktop -%{_datadir}/icons/* -%{_datadir}/metainfo/* +%{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop +## %{_datadir}/icons/* +## %{_datadir}/metainfo/* %license COPYRIGHT LICENSE %{python3_sitelib}/* From e6e983e3413cec8389e068b16c4c2185be39b84aa8065b6ff475d3310c7dbf42 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 28 Sep 2023 08:11:09 +0000 Subject: [PATCH 2/8] Accepting request 1114031 from home:DocB:branches:Application:ERP:GNUHealth:Factory - Version 2.0.0 * complete rewrite based on Kivy (instead Kirigami) * For Details see CHANGELOG - License string corrected - version 1.0.5 * switched source download to gnu.org, added signature * added documentation in DE, ES, FR * Minor adjustmends - version 1.0.4 * fixes plotting issues when matplotlib uses unsorted records or dup batch inputs. - version 1.0.3 * update of Uniprot-database * some minor changes / updates in the documentation and credits - Version 1.0.2 * MyGNUHealth does not display global menu on MATE * Update link from GNU Savannah - Version 1.0.1 * Fix the download path within GNU.org. Now it points to https://ftp.gnu.org/gnu/health/mygnuhealth/ * Include Changelog file * Include local / offline documentation (resides on /usr/share/doc/packages/mygnuhealth) * doc_path.diff added * Clean up __pycache__ from tarball - Version 1.0.0 - Version 0.7a6 initial OBS build OBS-URL: https://build.opensuse.org/request/show/1114031 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=29 --- mygnuhealth-1.9a5.tar.gz | 3 --- mygnuhealth-2.0.0.tar.gz | 3 +++ mygnuhealth-2.0.0.tar.gz.sig | Bin 0 -> 566 bytes mygnuhealth.changes | 4 ++-- mygnuhealth.spec | 16 ++++++++-------- 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 mygnuhealth-1.9a5.tar.gz create mode 100644 mygnuhealth-2.0.0.tar.gz create mode 100644 mygnuhealth-2.0.0.tar.gz.sig diff --git a/mygnuhealth-1.9a5.tar.gz b/mygnuhealth-1.9a5.tar.gz deleted file mode 100644 index b3adbdc..0000000 --- a/mygnuhealth-1.9a5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68978b69d15e40a3e6a5cfcb68fff3a8720016f6b445d0b885aba442f38e0d73 -size 13839341 diff --git a/mygnuhealth-2.0.0.tar.gz b/mygnuhealth-2.0.0.tar.gz new file mode 100644 index 0000000..a48cec6 --- /dev/null +++ b/mygnuhealth-2.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7351756241e464720fec0069b4423e770ef494df02cac98e3f2c48aad5892d36 +size 13701249 diff --git a/mygnuhealth-2.0.0.tar.gz.sig b/mygnuhealth-2.0.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ba51e6a9005b9b6bb9eb9d712cc6f7cb9901df3efa3a5051cde89808b5bc64a0 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j+zzsL{Bkz*Was*T9N72&P`n30(U0%a555daDa5Wp4T zt^k;knY@4y0I><@yht9y*=cXCiYlPtJS8v#0tHEV<3ZbHNj3H~db&%jeoO}1m$t5< zNZZT5Kqej1TfL|$g8opFOI4L4cdzW7Dx+s#&?0+`%!KQhb%7{Ws=a7m$%JLmeCI!g zq>Q?uGVU?}Xq&c%_6lO?U4#Z-G1Y<5GUi&26|{W@^uGmDg7Ss57u*bLCD;nqG3V$l zWC5I$zLUhSm@1pS5Gkl82HVkLT1_}D^Mz4;( zlV$m%SxHL8C|*BOz8#(7cBL1|<0-)g{bU1rJ~+Xq%v)j>!+tTZ8wt~o7GE;>I zG$rIz`gsnrnXol%4xtQ=m}Pt60VHa$+O5v3PO+E6S}bVTL7tyaZl`|9j7$;beK?bT_tFsQI6^e${v|CJYS0 z2v_7*8|Q4a8Qa8`2_+p5e^Ds?3_b`d_2~Aa E28%Ba>;M1& literal 0 HcmV?d00001 diff --git a/mygnuhealth.changes b/mygnuhealth.changes index 9e71ad3..dd83002 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu Sep 21 15:24:00 UTC 2023 - Axel Braun +Wed Sep 27 15:26:22 UTC 2023 - Axel Braun -- MyGNUHealth 1.9a5 +- Version 2.0.0 * complete rewrite based on Kivy (instead Kirigami) * For Details see CHANGELOG diff --git a/mygnuhealth.spec b/mygnuhealth.spec index b6ef547..e08ada9 100644 --- a/mygnuhealth.spec +++ b/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,22 +18,21 @@ %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) Name: mygnuhealth -Version: %{majorver}.9a5 +Version: %{majorver}.0.0 Release: 0 Summary: The personal health record for the GNU Health system License: GPL-3.0-or-later Group: Productivity/Office/Management URL: http://health.gnu.org/ -##Source: https://ftp.gnu.org/gnu/health/mygnuhealth/%{name}-%{version}.tar.gz -Source: %{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 +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 BuildRequires: fdupes @@ -50,6 +49,7 @@ BuildRequires: update-desktop-files Requires: python3-Kivy Requires: python3-bcrypt ## Requires: python3-matplotlib +Requires: python3-pygal Requires: python3-requests Requires: python3-tinydb @@ -67,7 +67,7 @@ This package includes the documentation for MyGNUHealth Personal Health Information Management System for Desktop and Mobile Devices %prep -%setup -q +%setup -q -n %{name} ## %autopatch -p1 %build From 70f39aafb53bf92cbc1dc40b3789ac80ef80334dcf0c79e6fbc1ea39b8fb347b Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 28 Sep 2023 09:05:34 +0000 Subject: [PATCH 3/8] Accepting request 1114041 from home:DocB:branches:Application:ERP:GNUHealth:Factory - Version 2.0.0 * complete rewrite based on Kivy (instead Kirigami) * For Details see CHANGELOG * doc_path.diff removed - License string corrected - version 1.0.5 * switched source download to gnu.org, added signature * added documentation in DE, ES, FR * Minor adjustmends - version 1.0.4 * fixes plotting issues when matplotlib uses unsorted records or dup batch inputs. - version 1.0.3 * update of Uniprot-database * some minor changes / updates in the documentation and credits - Version 1.0.2 * MyGNUHealth does not display global menu on MATE * Update link from GNU Savannah - Version 1.0.1 * Fix the download path within GNU.org. Now it points to https://ftp.gnu.org/gnu/health/mygnuhealth/ * Include Changelog file * Include local / offline documentation (resides on /usr/share/doc/packages/mygnuhealth) * doc_path.diff added * Clean up __pycache__ from tarball - Version 1.0.0 - Version 0.7a6 initial OBS build OBS-URL: https://build.opensuse.org/request/show/1114041 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=30 --- doc_path.diff | 14 -------------- mygnuhealth.changes | 3 ++- mygnuhealth.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 doc_path.diff diff --git a/doc_path.diff b/doc_path.diff deleted file mode 100644 index 25be7e5..0000000 --- a/doc_path.diff +++ /dev/null @@ -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']), diff --git a/mygnuhealth.changes b/mygnuhealth.changes index dd83002..268e39e 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -4,7 +4,8 @@ Wed Sep 27 15:26:22 UTC 2023 - Axel Braun - Version 2.0.0 * complete rewrite based on Kivy (instead Kirigami) * For Details see CHANGELOG - + * doc_path.diff removed + ------------------------------------------------------------------- Fri Mar 11 11:44:11 UTC 2022 - Axel Braun diff --git a/mygnuhealth.spec b/mygnuhealth.spec index e08ada9..6d77572 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -84,6 +84,12 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications org.gnuhealth.my #documentation in the MyGNUHealth-doc package is sufficient rm -rf %{buildroot}%{_docdir}/* +# Leap need special treatment +%if 0%{?suse_version} < 1600 +mkdir %{buildroot}%{_bindir} +cp bin/%{name} %{buildroot}%{_bindir}/. +%endif + %python_expand %fdupes %{buildroot}%{python3_sitelib} %post @@ -97,8 +103,6 @@ rm -rf /home/*/.cache/mygnuhealth %files %attr(755,root,root) %{_bindir}/%{name} %{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop -## %{_datadir}/icons/* -## %{_datadir}/metainfo/* %license COPYRIGHT LICENSE %{python3_sitelib}/* From 2aacf30a07b19d177cf39e53b8b2aa3fa6b8b031f80fb829b4f2ea1182ad85fc Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 28 Sep 2023 12:46:43 +0000 Subject: [PATCH 4/8] Accepting request 1114092 from home:DocB:branches:Application:ERP:GNUHealth:Factory - Version 2.0.0 * complete rewrite based on Kivy (instead Kirigami) * For Details see CHANGELOG * doc_path.diff removed * shebang.diff removed - License string corrected - version 1.0.5 * switched source download to gnu.org, added signature * added documentation in DE, ES, FR * Minor adjustmends - version 1.0.4 * fixes plotting issues when matplotlib uses unsorted records or dup batch inputs. - version 1.0.3 * update of Uniprot-database * some minor changes / updates in the documentation and credits - Version 1.0.2 * MyGNUHealth does not display global menu on MATE * Update link from GNU Savannah - Version 1.0.1 * Fix the download path within GNU.org. Now it points to https://ftp.gnu.org/gnu/health/mygnuhealth/ * Include Changelog file * Include local / offline documentation (resides on /usr/share/doc/packages/mygnuhealth) * doc_path.diff added * Clean up __pycache__ from tarball - Version 1.0.0 - Version 0.7a6 initial OBS build OBS-URL: https://build.opensuse.org/request/show/1114092 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=31 --- mygnuhealth.changes | 1 + shebang.diff | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 shebang.diff diff --git a/mygnuhealth.changes b/mygnuhealth.changes index 268e39e..e7a8fe7 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -5,6 +5,7 @@ Wed Sep 27 15:26:22 UTC 2023 - Axel Braun * 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 diff --git a/shebang.diff b/shebang.diff deleted file mode 100644 index 916ef87..0000000 --- a/shebang.diff +++ /dev/null @@ -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 - # Copyright (C) 2020-2021 GNU Solidario -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 - # Copyright (C) 2020-2021 GNU Solidario -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 - From 3173b06a8ac08202343b7facbd769c304cffeabd8c2baeeea41cad2c4fcebdcd Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 29 Sep 2023 16:34:05 +0000 Subject: [PATCH 5/8] Accepting request 1114412 from home:bnavigator:branches:Application:ERP:GNUHealth:Factory - Fix BuildRequirements - Fix doc package duplicate file warning - Remove stray singlespec OBS-URL: https://build.opensuse.org/request/show/1114412 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=32 --- mygnuhealth.changes | 7 +++++ mygnuhealth.spec | 63 ++++++++++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/mygnuhealth.changes b/mygnuhealth.changes index e7a8fe7..4d8039b 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 29 16:13:11 UTC 2023 - Ben Greiner + +- Fix BuildRequirements +- Fix doc package duplicate file warning +- Remove stray singlespec + ------------------------------------------------------------------- Wed Sep 27 15:26:22 UTC 2023 - Axel Braun diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 6d77572..499969c 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -35,23 +35,35 @@ Source1: https://ftp.gnu.org/gnu/health/mygnuhealth/%{name}-%{version}.ta Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=health&download=1#/%{name}.keyring ## Patch0: shebang.diff ## Patch1: doc_path.diff +# SECTION build BuildRequires: fdupes +BuildRequires: python3-wheel +BuildRequires: python3-setuptools >= 61 +BuildRequires: python3-pip +BuildRequires: update-desktop-files +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: python3-bcrypt -## BuildRequires: python3-matplotlib BuildRequires: python3-Kivy BuildRequires: python3-pygal -BuildRequires: python3-pip -BuildRequires: python3-pip-wheel -BuildRequires: python3-setuptools-wheel BuildRequires: python3-tinydb -BuildRequires: python3-wheel -BuildRequires: update-desktop-files -Requires: python3-Kivy +BuildRequires: python3-requests +BuildRequires: python3-CairoSVG +# DO NOT SUBMIT TO FACTORY UNTIL THIS IS PATCHED to tinycss2 or old obsolete tinycss is back +#BuildRequires: python3-tinycss +BuildRequires: python3-cssselect Requires: python3-bcrypt -## Requires: python3-matplotlib +Requires: python3-Kivy Requires: python3-pygal -Requires: python3-requests Requires: python3-tinydb +Requires: python3-requests +Requires: python3-CairoSVG +Requires: python3-tinycss +Requires: python3-cssselect +# /SECTION +BuildArch: noarch %description The Personal Health Information Management System for Desktop and Mobile Devices @@ -60,37 +72,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 -n %{name} -## %autopatch -p1 +%autosetup -p1 -n %{name} %build -%pyproject_wheel +%python3_pyproject_wheel %install -%pyproject_install -## --prefix=%{_prefix} --root=%{buildroot} +%python3_pyproject_install + +# remove shebang +sed -i '1{/env python/d}' %{buildroot}%{python3_sitelib}/mygnuhealth/*.py # menu-entry 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}/* +%fdupes %{buildroot}%{python3_sitelib} -# Leap need special treatment -%if 0%{?suse_version} < 1600 -mkdir %{buildroot}%{_bindir} -cp bin/%{name} %{buildroot}%{_bindir}/. -%endif - -%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 @@ -104,9 +112,12 @@ rm -rf /home/*/.cache/mygnuhealth %attr(755,root,root) %{_bindir}/%{name} %{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop %license COPYRIGHT LICENSE -%{python3_sitelib}/* +%{python3_sitelib}/mygnuhealth +%{python3_sitelib}/mygnuhealth-%{version}.dist-info + %files -n %{name}-doc -%doc README.rst doc/* +%doc README.rst +%{_docdir}/* %changelog From f3a71b890086da13730a41251ff6d6c6cc31ec6e7161217b4a5df113a3c01a4d Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 29 Sep 2023 16:40:56 +0000 Subject: [PATCH 6/8] Accepting request 1114417 from home:bnavigator:branches:Application:ERP:GNUHealth:Factory second submit because I didn't supersede - Back to singlespec for a single flavor in order to use sle15_python_module_pythons OBS-URL: https://build.opensuse.org/request/show/1114417 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=33 --- mygnuhealth.changes | 6 +++++ mygnuhealth.spec | 60 ++++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/mygnuhealth.changes b/mygnuhealth.changes index 4d8039b..61b90e7 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 29 16:31:48 UTC 2023 - Ben Greiner + +- 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 diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 499969c..a62b532 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -23,6 +23,14 @@ #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 +%else +# needs Python 3.9+ +%{?sle15_python_module_pythons} +%endif + Name: mygnuhealth Version: %{majorver}.0.0 Release: 0 @@ -37,33 +45,35 @@ Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=he ## Patch1: doc_path.diff # SECTION build BuildRequires: fdupes -BuildRequires: python3-wheel -BuildRequires: python3-setuptools >= 61 -BuildRequires: python3-pip +BuildRequires: %{python_module wheel} +BuildRequires: %{python_module setuptools >= 61} +BuildRequires: %{python_module pip} BuildRequires: update-desktop-files 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: python3-bcrypt -BuildRequires: python3-Kivy -BuildRequires: python3-pygal -BuildRequires: python3-tinydb -BuildRequires: python3-requests -BuildRequires: python3-CairoSVG +BuildRequires: %{python_module bcrypt} +BuildRequires: %{python_module Kivy} +BuildRequires: %{python_module pygal} +BuildRequires: %{python_module tinydb} +BuildRequires: %{python_module requests} +BuildRequires: %{python_module CairoSVG} # DO NOT SUBMIT TO FACTORY UNTIL THIS IS PATCHED to tinycss2 or old obsolete tinycss is back -#BuildRequires: python3-tinycss -BuildRequires: python3-cssselect -Requires: python3-bcrypt -Requires: python3-Kivy -Requires: python3-pygal -Requires: python3-tinydb -Requires: python3-requests -Requires: python3-CairoSVG -Requires: python3-tinycss -Requires: python3-cssselect +#BuildRequires: %%{python_module tinycss} +BuildRequires: %{python_module cssselect} +Requires: python-bcrypt +Requires: python-Kivy +Requires: python-pygal +Requires: python-tinydb +Requires: python-requests +Requires: python-CairoSVG +Requires: python-tinycss +Requires: python-cssselect # /SECTION BuildArch: noarch +# singlespec rewriter for exactly one python (see above) +%python_subpackages %description The Personal Health Information Management System for Desktop and Mobile Devices @@ -81,19 +91,19 @@ Information Management System for Desktop and Mobile Devices %autosetup -p1 -n %{name} %build -%python3_pyproject_wheel +%pyproject_wheel %install -%python3_pyproject_install +%pyproject_install # remove shebang -sed -i '1{/env python/d}' %{buildroot}%{python3_sitelib}/mygnuhealth/*.py +%python_expand sed -i '1{/env python/d}' %{buildroot}%{python_sitelib}/mygnuhealth/*.py # menu-entry desktop-file-install --dir %{buildroot}%{_datadir}/applications org.gnuhealth.mygnuhealth.desktop %suse_update_desktop_file org.gnuhealth.mygnuhealth -%fdupes %{buildroot}%{python3_sitelib} +%python_expand %fdupes %{buildroot}%{python_sitelib} # install and deduplicate doc mkdir -p %{buildroot}%{_docdir}/%{name}-doc/ @@ -112,8 +122,8 @@ rm -rf /home/*/.cache/mygnuhealth %attr(755,root,root) %{_bindir}/%{name} %{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop %license COPYRIGHT LICENSE -%{python3_sitelib}/mygnuhealth -%{python3_sitelib}/mygnuhealth-%{version}.dist-info +%{python_sitelib}/mygnuhealth +%{python_sitelib}/mygnuhealth-%{version}.dist-info %files -n %{name}-doc From 5c8ed1951b29839a9739dd4d51533e96e886e32a124b6181178eeb01fc9def79 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 29 Sep 2023 18:14:33 +0000 Subject: [PATCH 7/8] Accepting request 1114435 from home:bnavigator:branches:Application:ERP:GNUHealth:Factory - 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 OBS-URL: https://build.opensuse.org/request/show/1114435 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=34 --- mygnuhealth.changes | 9 +++++++++ mygnuhealth.spec | 8 +------- remove-obsolete-deps.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 remove-obsolete-deps.patch diff --git a/mygnuhealth.changes b/mygnuhealth.changes index 61b90e7..bf74a9c 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 29 18:03:46 UTC 2023 - Ben Greiner + +- 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 diff --git a/mygnuhealth.spec b/mygnuhealth.spec index a62b532..8cde7ea 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -41,8 +41,7 @@ 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 -## Patch1: doc_path.diff +Patch0: remove-obsolete-deps.patch # SECTION build BuildRequires: fdupes BuildRequires: %{python_module wheel} @@ -59,17 +58,12 @@ BuildRequires: %{python_module pygal} BuildRequires: %{python_module tinydb} BuildRequires: %{python_module requests} BuildRequires: %{python_module CairoSVG} -# DO NOT SUBMIT TO FACTORY UNTIL THIS IS PATCHED to tinycss2 or old obsolete tinycss is back -#BuildRequires: %%{python_module tinycss} -BuildRequires: %{python_module cssselect} Requires: python-bcrypt Requires: python-Kivy Requires: python-pygal Requires: python-tinydb Requires: python-requests Requires: python-CairoSVG -Requires: python-tinycss -Requires: python-cssselect # /SECTION BuildArch: noarch # singlespec rewriter for exactly one python (see above) diff --git a/remove-obsolete-deps.patch b/remove-obsolete-deps.patch new file mode 100644 index 0000000..3b07ed9 --- /dev/null +++ b/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=[ From 010234407bb0afc76f58fd8883e7945890d925f2d5a548455223ef5c00d2cff3 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Fri, 29 Sep 2023 18:44:27 +0000 Subject: [PATCH 8/8] Accepting request 1114437 from home:bnavigator:branches:Application:ERP:GNUHealth:Factory - Fix single singlespec: Can't use python_subpackages rewriter OBS-URL: https://build.opensuse.org/request/show/1114437 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=35 --- mygnuhealth.changes | 5 +++++ mygnuhealth.spec | 23 ++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/mygnuhealth.changes b/mygnuhealth.changes index bf74a9c..45d0927 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 29 18:39:29 UTC 2023 - Ben Greiner + +- Fix single singlespec: Can't use python_subpackages rewriter + ------------------------------------------------------------------- Fri Sep 29 18:03:46 UTC 2023 - Ben Greiner diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 8cde7ea..6c96ad9 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -26,9 +26,14 @@ %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 @@ -58,16 +63,16 @@ BuildRequires: %{python_module pygal} BuildRequires: %{python_module tinydb} BuildRequires: %{python_module requests} BuildRequires: %{python_module CairoSVG} -Requires: python-bcrypt -Requires: python-Kivy -Requires: python-pygal -Requires: python-tinydb -Requires: python-requests -Requires: python-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) -%python_subpackages + %description The Personal Health Information Management System for Desktop and Mobile Devices @@ -116,8 +121,8 @@ rm -rf /home/*/.cache/mygnuhealth %attr(755,root,root) %{_bindir}/%{name} %{_datadir}/applications/org.gnuhealth.mygnuhealth.desktop %license COPYRIGHT LICENSE -%{python_sitelib}/mygnuhealth -%{python_sitelib}/mygnuhealth-%{version}.dist-info +%{mypython_sitelib}/mygnuhealth +%{mypython_sitelib}/mygnuhealth-%{version}.dist-info %files -n %{name}-doc