From 7f41bf071636816d5c1adb4b64e938b0b3bdd9ddf1694804c5963280f9a2387b Mon Sep 17 00:00:00 2001
From: Axel Braun <axel.braun@gmx.de>
Date: Sun, 8 Sep 2019 16:43:31 +0000
Subject: [PATCH] Accepting request 729250 from
 Application:ERP:GNUHealth:Factory

wrong commit

OBS-URL: https://build.opensuse.org/request/show/729250
OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/gnuhealth-client?expand=0&rev=25
---
 gnuhealth-client-35.tar.gz |  3 --
 gnuhealth-client.spec      | 62 ++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 35 deletions(-)
 delete mode 100644 gnuhealth-client-35.tar.gz

diff --git a/gnuhealth-client-35.tar.gz b/gnuhealth-client-35.tar.gz
deleted file mode 100644
index 609bdf1..0000000
--- a/gnuhealth-client-35.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04d81feb75d2934776b8d28f4f7a0b585aff0809fe52ec27eaa681797ad42fe2
-size 783635
diff --git a/gnuhealth-client.spec b/gnuhealth-client.spec
index 3c31200..48a53df 100644
--- a/gnuhealth-client.spec
+++ b/gnuhealth-client.spec
@@ -17,49 +17,46 @@
 #
 
 
-%define majorver 3
+%define majorver 3.4
 Name:           gnuhealth-client
-Version:        %{majorver}5
+Version:        %{majorver}.4
 Release:        0
 Summary:        The client of the GNU Health Hospital system
 License:        GPL-3.0-only
 Group:          Productivity/Office/Management
 Url:            http://health.gnu.org/
-### https://files.pythonhosted.org/packages/source/g/%{name}/%{name}-%{version}.tar.gz
-Source:         %{name}-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/g/%{name}/%{name}-%{version}.tar.gz
 Source1:        ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_camera-latest.tar.gz
 Source2:        ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_crypto-latest.tar.gz
 Source3:        ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_frl-latest.tar.gz
 Source4:        %{name}.desktop
-
 BuildRequires:  fdupes
-BuildRequires:  python3-Babel
-BuildRequires:  python3-Sphinx
-BuildRequires:  python3-devel
-BuildRequires:  python3-gobject
-BuildRequires:  python3-python-dateutil
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-simplejson
+BuildRequires:  python-Babel
+BuildRequires:  python-Sphinx
+# List of additional build dependencies
+BuildRequires:  python-devel
+BuildRequires:  python-gtk
+BuildRequires:  python-python-dateutil
+BuildRequires:  python-setuptools
+BuildRequires:  python-simplejson
 BuildRequires:  update-desktop-files
-
-##Requires:       librsvg
-Requires:       opencv
-Requires:       python3-GooCalendar >= 0.5
-Requires:       python3-chardet
-Requires:       python3-dateutil
-Requires:       python3-gnupg
-Requires:       python3-gobject
-Requires:       python3-opencv
-Requires:       python3-pytz
-Requires:       python3-setuptools
-Requires:       python3-simplejson
-Requires:       python3-xml
-BuildArch:      noarch
-
+#Requires:       librsvg
 #for the plugins:
-##Requires:       python3-cdecimal
-
+Requires:       opencv
+Requires:       python-cdecimal
+Requires:       python-chardet
+Requires:       python-dateutil
+Requires:       python-gnupg
+Requires:       python-gtk
+Requires:       python-opencv
+Requires:       python-pytz
+Requires:       python-setuptools
+Requires:       python-simplejson
+Requires:       python-xml
+Requires:       python2-GooCalendar < 0.5
+#install Tryton or GNU Health Client
 Conflicts:      tryton
+BuildArch:      noarch
 
 %description
 The client of the GNU Health Hospital application
@@ -82,16 +79,17 @@ tar  -xzvf %{SOURCE3}
 :
 
 %install
-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
 # menu-entry
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
 %suse_update_desktop_file %{name}
 
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-cp tryton/data/pixmaps/tryton/gnuhealth-icon.png %{buildroot}%{_datadir}/pixmaps/gnuhealth.png
+cp %{buildroot}%{python_sitelib}/tryton/data/pixmaps/tryton/gnuhealth-icon.png %{buildroot}%{_datadir}/pixmaps/gnuhealth.png
 
-%python_expand %fdupes %{buildroot}%{$python_sitearch}
+##%fdupes %{buildroot}%{_datadir}
+##%fdupes %{buildroot}%{_prefix}/lib
 
 %post
 %desktop_database_post