diff --git a/gnuhealth-client-3.4.4.tar.gz b/gnuhealth-client-3.4.4.tar.gz deleted file mode 100644 index 0f2fc3a..0000000 --- a/gnuhealth-client-3.4.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efcf2bc2a18bbc94deecaf5d711f84e012521d99c3a733307d9c4adf34401b96 -size 668110 diff --git a/gnuhealth-client-3.6.1.tar.gz b/gnuhealth-client-3.6.1.tar.gz new file mode 100644 index 0000000..0e0365f --- /dev/null +++ b/gnuhealth-client-3.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9609a7bb8e6b336db80246f96386624b7731b4669c4f308d246890149b118d51 +size 684267 diff --git a/gnuhealth-client.changes b/gnuhealth-client.changes index f04640c..f34a673 100644 --- a/gnuhealth-client.changes +++ b/gnuhealth-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 21 14:42:32 UTC 2019 - Axel Braun + +- version 3.6.0 + ------------------------------------------------------------------- Mon Nov 11 18:56:37 UTC 2019 - Axel Braun diff --git a/gnuhealth-client.spec b/gnuhealth-client.spec index 078d619..1c9b97b 100644 --- a/gnuhealth-client.spec +++ b/gnuhealth-client.spec @@ -1,7 +1,7 @@ # # spec file for package gnuhealth-client # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2015-2019 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties @@ -17,48 +17,52 @@ # -%define majorver 3.4 +%define majorver 3.6 Name: gnuhealth-client -Version: %{majorver}.4 +Version: %{majorver}.1 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/ +URL: http://health.gnu.org/ Source: https://files.pythonhosted.org/packages/source/g/%{name}/%{name}-%{version}.tar.gz -Source1: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_camera-3.4.0.tar.gz -Source2: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_crypto-3.4.1.tar.gz -Source3: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth_plugin_frl-3.4.1.tar.gz +##urce: %{name}-%{version}.tar.gz +##urce1: %{name}-plugins-%{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 -Patch0: camera.diff -BuildRequires: fdupes -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 + +###uildRequires: fdupes +BuildRequires: python3-Babel +BuildRequires: python3-Sphinx +BuildRequires: python3-devel +BuildRequires: python3-gobject +BuildRequires: python3-python-dateutil +BuildRequires: python3-setuptools +BuildRequires: python3-simplejson BuildRequires: update-desktop-files -#Requires: librsvg -#for the plugins: + +Requires: gobject-introspection 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 +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 BuildArch: noarch +Conflicts: tryton + %description The client of the GNU Health Hospital application @@ -67,40 +71,31 @@ The client of the GNU Health Hospital application cp %{SOURCE4} . pwd -cd tryton/plugins/ -#tar --strip-components 1 -xzvf %{SOURCE1} -#tar --strip-components 1 -xzvf %{SOURCE2} -#tar --strip-components 1 -xzvf %{SOURCE3} - +cd tryton/plugins tar -xzvf %{SOURCE1} tar -xzvf %{SOURCE2} tar -xzvf %{SOURCE3} -%patch0 -p1 +#workaround for tryton bug: directory name with version is not considered +mv gnuhealth_plugin_camera* camera +mv gnuhealth_plugin_crypto* crypto +mv gnuhealth_plugin_frl* frl %build : %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +python3 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 %{buildroot}%{python_sitelib}/tryton/data/pixmaps/tryton/gnuhealth-icon.png %{buildroot}%{_datadir}/pixmaps/gnuhealth.png -##%fdupes %{buildroot}%{_datadir} -##%fdupes %{buildroot}%{_prefix}/lib +cp %{buildroot}$(ls -d /usr/lib/python3.* )/site-packages/tryton/data/pixmaps/tryton/gnuhealth-icon.png %{buildroot}%{_datadir}/pixmaps/gnuhealth.png -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun +###thon_expand %fdupes %{buildroot}%{python_sitelib} %files %{_bindir}/%{name} diff --git a/gnuhealth_plugin_camera-3.4.0.tar.gz b/gnuhealth_plugin_camera-3.4.0.tar.gz deleted file mode 100644 index 90c48a5..0000000 --- a/gnuhealth_plugin_camera-3.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4012eed15bc9da865c553a2122cf2547a5e5e741f22c43f2044ef8a2f920b998 -size 14516 diff --git a/gnuhealth_plugin_camera-latest.tar.gz b/gnuhealth_plugin_camera-latest.tar.gz new file mode 100644 index 0000000..52859bb --- /dev/null +++ b/gnuhealth_plugin_camera-latest.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87cd8356a826e5ed84df743c95f05934db2846e40707781d9a2cc49171d364cb +size 16368 diff --git a/gnuhealth_plugin_crypto-3.4.1.tar.gz b/gnuhealth_plugin_crypto-3.4.1.tar.gz deleted file mode 100644 index 6ab245f..0000000 --- a/gnuhealth_plugin_crypto-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3de543edfaa8aa9060cc2f82fb8bfc408689859926e2104758897390caa01fb2 -size 2814 diff --git a/gnuhealth_plugin_crypto-latest.tar.gz b/gnuhealth_plugin_crypto-latest.tar.gz new file mode 100644 index 0000000..7627e5d --- /dev/null +++ b/gnuhealth_plugin_crypto-latest.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97fd2f18371f7ddd01e1ca29a4103abbc8771db128a64114f3d0bd17ed43199a +size 4248 diff --git a/gnuhealth_plugin_frl-3.4.1.tar.gz b/gnuhealth_plugin_frl-3.4.1.tar.gz deleted file mode 100644 index 2099bb2..0000000 --- a/gnuhealth_plugin_frl-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e2fccf9d55a5a4a00db841e5b9a01599aaf7e4b4ae04fa836bd0efd208d5545 -size 11113 diff --git a/gnuhealth_plugin_frl-latest.tar.gz b/gnuhealth_plugin_frl-latest.tar.gz new file mode 100644 index 0000000..87bb203 --- /dev/null +++ b/gnuhealth_plugin_frl-latest.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a36578701433112949e31031e2247abbefd59c1bdc443cab8435b651af478ceb +size 15095