From ede1378f95672e7e96ecf279e9429e9667f6bebaa9df6ef2527264f7d763d83c Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 16 Feb 2021 07:37:01 +0000 Subject: [PATCH] Accepting request 872714 from Application:ERP:GNUHealth:3.8 Bugfix release OBS-URL: https://build.opensuse.org/request/show/872714 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/gnuhealth-client?expand=0&rev=48 --- gnuhealth-client-3.6.9.tar.gz | 3 --- gnuhealth-client-3.8.1.tar.gz | 3 +++ gnuhealth-client.changes | 6 +++++ gnuhealth-client.spec | 34 +++++++++------------------ gnuhealth_plugin_camera-latest.tar.gz | 4 ++-- 5 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 gnuhealth-client-3.6.9.tar.gz create mode 100644 gnuhealth-client-3.8.1.tar.gz diff --git a/gnuhealth-client-3.6.9.tar.gz b/gnuhealth-client-3.6.9.tar.gz deleted file mode 100644 index 01421eb..0000000 --- a/gnuhealth-client-3.6.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0033e77641ba650da0efc15f7443008289c8e777c94667f07b624ba1ee6d034 -size 700094 diff --git a/gnuhealth-client-3.8.1.tar.gz b/gnuhealth-client-3.8.1.tar.gz new file mode 100644 index 0000000..c8dae3f --- /dev/null +++ b/gnuhealth-client-3.8.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a679fe1ad368681e0b005dd4d68ae0ded55e556781b14240b51385d21f6f3b63 +size 728492 diff --git a/gnuhealth-client.changes b/gnuhealth-client.changes index c504692..a8d6996 100644 --- a/gnuhealth-client.changes +++ b/gnuhealth-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 15 10:52:18 UTC 2021 - Axel Braun + +- version 3.8.1 + spec-file updated to use new python macros + ------------------------------------------------------------------- Sat Nov 7 16:56:47 UTC 2020 - Axel Braun diff --git a/gnuhealth-client.spec b/gnuhealth-client.spec index 6f0a2e4..91672cb 100644 --- a/gnuhealth-client.spec +++ b/gnuhealth-client.spec @@ -1,8 +1,8 @@ # # spec file for package gnuhealth-client # -# Copyright (c) 2020 SUSE LLC -# Copyright (c) 2015-2019 Dr. Axel Braun +# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2015-2021 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ # -%define majorver 3.6 +%define majorver 3.8 Name: gnuhealth-client -Version: %{majorver}.9 +Version: %{majorver}.1 Release: 0 Summary: The client of the GNU Health Hospital system License: GPL-3.0-only @@ -33,7 +33,7 @@ Source2: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_crypto-lat Source3: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_frl-latest.tar.gz Source4: %{name}.desktop -###uildRequires: fdupes +BuildRequires: fdupes BuildRequires: python3-Babel BuildRequires: python3-Sphinx BuildRequires: python3-devel @@ -45,20 +45,8 @@ BuildRequires: update-desktop-files Requires: gobject-introspection Requires: opencv -Requires: python3-GooCalendar >= 0.5 -Requires: python3-cairo -Requires: python3-chardet -Requires: python3-dateutil -Requires: python3-gnupg -Requires: python3-gobject -Requires: python3-gobject-Gdk -Requires: python3-gobject-cairo -Requires: python3-numpy -Requires: python3-opencv -Requires: python3-pytz -Requires: python3-setuptools -Requires: python3-simplejson -Requires: python3-xml +%{?python_enable_dependency_generator} + BuildArch: noarch Conflicts: tryton @@ -85,10 +73,10 @@ mv gnuhealth_plugin_frl* frl rm -rf */__pycache__ %build -: +%python3_build %install -python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python3_install --prefix=%{_prefix} --root=%{buildroot} # menu-entry desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop @@ -98,7 +86,7 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps cp %{buildroot}$(ls -d /usr/lib/python3.* )/site-packages/tryton/data/pixmaps/tryton/gnuhealth-icon.png %{buildroot}%{_datadir}/pixmaps/gnuhealth.png -###thon_expand %fdupes %{buildroot}%{python_sitelib} +%python_expand %fdupes %{buildroot}%{python3_sitelib} %files %{_bindir}/%{name} @@ -106,6 +94,6 @@ cp %{buildroot}$(ls -d /usr/lib/python3.* )/site-packages/tryton/data/pixmaps/tr %doc Changelog %license COPYRIGHT COPYING %{_datadir}/pixmaps/* -%{python_sitelib}/* +%{python3_sitelib}/* %changelog diff --git a/gnuhealth_plugin_camera-latest.tar.gz b/gnuhealth_plugin_camera-latest.tar.gz index 52859bb..cddaeb1 100644 --- a/gnuhealth_plugin_camera-latest.tar.gz +++ b/gnuhealth_plugin_camera-latest.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87cd8356a826e5ed84df743c95f05934db2846e40707781d9a2cc49171d364cb -size 16368 +oid sha256:b020296174943bb64f96c9c8ac9c9318819e3f15ab128e13a38862391e529f8c +size 16041