From 79a133efbba5c74fb7cca3842f125b0967966bf2f8b42780e5f47144c8859de7 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 8 Jul 2021 06:42:51 +0000 Subject: [PATCH 1/6] - 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) * Clean up __pycache__ from tarball OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=14 --- MyGNUHealth-1.0.0.tar.gz | 3 --- MyGNUHealth-1.0.1.tar.gz | 3 +++ mygnuhealth.changes | 11 +++++++++++ mygnuhealth.spec | 15 ++++++++------- 4 files changed, 22 insertions(+), 10 deletions(-) delete mode 100644 MyGNUHealth-1.0.0.tar.gz create mode 100644 MyGNUHealth-1.0.1.tar.gz diff --git a/MyGNUHealth-1.0.0.tar.gz b/MyGNUHealth-1.0.0.tar.gz deleted file mode 100644 index 584b884..0000000 --- a/MyGNUHealth-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21611c1a9a00273572e52e731ea28348e60ed737fb9dd35cdf62c0ca927a1f16 -size 4706504 diff --git a/MyGNUHealth-1.0.1.tar.gz b/MyGNUHealth-1.0.1.tar.gz new file mode 100644 index 0000000..91a43df --- /dev/null +++ b/MyGNUHealth-1.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a77c087572a9c1e24d3b63d64ecca19f74b58aecc9ea2555c73d168e14be9b0 +size 4706576 diff --git a/mygnuhealth.changes b/mygnuhealth.changes index c219355..777926a 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jul 8 06:40:10 UTC 2021 - Axel Braun + +- 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) +* Clean up __pycache__ from tarball + ------------------------------------------------------------------- Thu Jun 24 15:30:33 UTC 2021 - Axel Braun diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 577b411..e6d1e2c 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define modname MyGNUHealth %define majorver 1 @@ -23,7 +24,7 @@ %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.0 +Version: %{majorver}.0.1 Release: 0 Summary: The personal health record for the GNU Health system License: GPL-3.0-only @@ -32,18 +33,18 @@ URL: http://health.gnu.org/ Source: https://files.pythonhosted.org/packages/source/M/%{modname}/%{modname}-%{version}.tar.gz Patch0: shebang.diff BuildRequires: fdupes -BuildRequires: python3-pyside2 >= 5.15 -BuildRequires: python3-matplotlib -BuildRequires: python3-tinydb BuildRequires: python3-bcrypt +BuildRequires: python3-matplotlib +BuildRequires: python3-pyside2 >= 5.15 BuildRequires: python3-setuptools +BuildRequires: python3-tinydb BuildRequires: update-desktop-files Requires: kirigami2 -Requires: python3-pyside2 >= 5.15 +Requires: python3-bcrypt Requires: python3-matplotlib +Requires: python3-pyside2 >= 5.15 Requires: python3-requests Requires: python3-tinydb -Requires: python3-bcrypt %description The Personal Health Information Management System for Desktop and Mobile Devices @@ -55,7 +56,7 @@ Group: Productivity/Office/Management BuildArch: noarch %description -n %{name}-doc -This package includes the documentation for MyGNUHealth Personal Health +This package includes the documentation for MyGNUHealth Personal Health Information Management System for Desktop and Mobile Devices %prep From e270b712376c3ba805c075ab6674242f63834324432397bcdfcfd0446a205fc7 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 8 Jul 2021 06:57:06 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=15 --- mygnuhealth.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mygnuhealth.spec b/mygnuhealth.spec index e6d1e2c..3c00afc 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -73,6 +73,11 @@ Information Management System for Desktop and Mobile Devices desktop-file-install --dir %{buildroot}%{_datadir}/applications org.kde.mygnuhealth.desktop %suse_update_desktop_file org.kde.mygnuhealth +#adapt documentation path to system standard. +cd %{buildroot}%{_docdir} +cd .. +mv mygnuhealth/. %{buildroot}%{_docdir}/. + %python_expand %fdupes %{buildroot}%{python3_sitelib} %post From 8ad6c5368a3972f945de1543811ff2d5da5c51ac0c18de7c30ee189bfff7a50f Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 8 Jul 2021 07:46:36 +0000 Subject: [PATCH 3/6] /usr/share/doc/packages/mygnuhealth) * doc_path.diff added OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=16 --- doc_path.diff | 14 ++++++++++++++ mygnuhealth.changes | 3 ++- mygnuhealth.spec | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 doc_path.diff diff --git a/doc_path.diff b/doc_path.diff new file mode 100644 index 0000000..25be7e5 --- /dev/null +++ b/doc_path.diff @@ -0,0 +1,14 @@ +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 777926a..fc9150e 100644 --- a/mygnuhealth.changes +++ b/mygnuhealth.changes @@ -6,7 +6,8 @@ Thu Jul 8 06:40:10 UTC 2021 - Axel Braun https://ftp.gnu.org/gnu/health/mygnuhealth/ * Include Changelog file * Include local / offline documentation (resides on - /usr/share/doc/packages/mygnuhealth) + /usr/share/doc/packages/mygnuhealth) +* doc_path.diff added * Clean up __pycache__ from tarball ------------------------------------------------------------------- diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 3c00afc..546ad24 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -32,6 +32,7 @@ Group: Productivity/Office/Management URL: http://health.gnu.org/ Source: https://files.pythonhosted.org/packages/source/M/%{modname}/%{modname}-%{version}.tar.gz Patch0: shebang.diff +Patch1: doc_path.diff BuildRequires: fdupes BuildRequires: python3-bcrypt BuildRequires: python3-matplotlib @@ -61,7 +62,7 @@ Information Management System for Desktop and Mobile Devices %prep %setup -q -n %{modname}-%{version} -%patch0 -p1 +%autopatch -p1 %build %python3_build From 7b5d555bc0d336ed15ee1cc300095c6e61beb8cd6134b44294f7cbbabc5d406b Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 8 Jul 2021 07:50:28 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=17 --- mygnuhealth.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 546ad24..6fc2e0b 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -74,11 +74,6 @@ Information Management System for Desktop and Mobile Devices desktop-file-install --dir %{buildroot}%{_datadir}/applications org.kde.mygnuhealth.desktop %suse_update_desktop_file org.kde.mygnuhealth -#adapt documentation path to system standard. -cd %{buildroot}%{_docdir} -cd .. -mv mygnuhealth/. %{buildroot}%{_docdir}/. - %python_expand %fdupes %{buildroot}%{python3_sitelib} %post From 3fe321496602a5388654a15d44c624c68da5f98e64ca6f99e910c9698f5dfaa0 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 8 Jul 2021 07:54:33 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=18 --- mygnuhealth.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 6fc2e0b..3db83af 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -94,5 +94,6 @@ rm -rf /home/*/.cache/mygnuhealth %files -n %{name}-doc %doc README.rst doc/* +%doc %{docdir}/. %changelog From 0d55cf5d1086f5bd51f265bc273467dd9beeed83deb0cb5f2158de34959dea16 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Thu, 8 Jul 2021 13:37:57 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/mygnuhealth?expand=0&rev=19 --- mygnuhealth.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mygnuhealth.spec b/mygnuhealth.spec index 3db83af..f31cd22 100644 --- a/mygnuhealth.spec +++ b/mygnuhealth.spec @@ -74,6 +74,9 @@ Information Management System for Desktop and Mobile Devices desktop-file-install --dir %{buildroot}%{_datadir}/applications org.kde.mygnuhealth.desktop %suse_update_desktop_file org.kde.mygnuhealth +#documentation in the MyGNUHealth-doc package is sufficient +rm -rf %{buildroot}%{_docdir}/* + %python_expand %fdupes %{buildroot}%{python3_sitelib} %post @@ -94,6 +97,5 @@ rm -rf /home/*/.cache/mygnuhealth %files -n %{name}-doc %doc README.rst doc/* -%doc %{docdir}/. %changelog