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

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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>
 

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:  python3-requests
-BuildRequires:  update-desktop-files
+BuildRequires:  python3-CairoSVG
-Requires:       python3-Kivy
+# 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}
+%autosetup -p1 -n %{name}
-## %autopatch -p1
 
 %build
-%pyproject_wheel
+%python3_pyproject_wheel
 
 %install
-%pyproject_install 
+%python3_pyproject_install
-## --prefix=%{_prefix} --root=%{buildroot}
+
+# 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
+%fdupes %{buildroot}%{python3_sitelib}
-rm -rf %{buildroot}%{_docdir}/*
 
-# Leap need special treatment
+# install and deduplicate doc
-%if 0%{?suse_version} < 1600
+mkdir -p %{buildroot}%{_docdir}/%{name}-doc/
-mkdir %{buildroot}%{_bindir}
+cp -r doc/* %{buildroot}%{_docdir}/%{name}-doc/
-cp bin/%{name} %{buildroot}%{_bindir}/.
+%fdupes %{buildroot}%{_docdir}
-%endif
-
-%python_expand %fdupes %{buildroot}%{python3_sitelib}
 
 %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