From 1606de90dbaaac69a19d8f841cb86495c167543e5eea3d7ce5d32b6176f10ddc Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 28 Dec 2018 14:12:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/gnuhealth-client?expand=0&rev=8 --- _service | 2 +- gnuhealth-client-3.4.1.tar.gz | 3 --- gnuhealth-client.changes | 13 --------- gnuhealth-client.spec | 39 +++++++++++---------------- gnuhealth_plugin_camera-latest.tar.gz | 3 --- gnuhealth_plugin_crypto-latest.tar.gz | 4 +-- gnuhealth_plugin_frl-latest.tar.gz | 3 --- 7 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 gnuhealth-client-3.4.1.tar.gz delete mode 100644 gnuhealth_plugin_camera-latest.tar.gz delete mode 100644 gnuhealth_plugin_frl-latest.tar.gz diff --git a/_service b/_service index aa59ca1..dbfc161 100644 --- a/_service +++ b/_service @@ -1,4 +1,4 @@ - + diff --git a/gnuhealth-client-3.4.1.tar.gz b/gnuhealth-client-3.4.1.tar.gz deleted file mode 100644 index 3545a51..0000000 --- a/gnuhealth-client-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7969b60d87013952833bbbc663eeac63c01143100b7ba089ab3f94f930790402 -size 665124 diff --git a/gnuhealth-client.changes b/gnuhealth-client.changes index 5d1a5f4..3e8de3d 100644 --- a/gnuhealth-client.changes +++ b/gnuhealth-client.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 11 17:34:32 UTC 2018 - Axel Braun - -- New client for the GNU Health 3.4 series based on Tryton 4.6 series - * Enhanced support for Calendar and WebDAV system - * Native client has a command line interface - * Over 30 new commands for the main daily tasks - * Enhanced GNU Health camera plugin, including zoom - * gnuhealth_crypto.patch replaced by plugin - * Activity Log window on the client - * SYSINFO command to retrieve the information about client and server - * Customize the banner on the client - ------------------------------------------------------------------- Fri Mar 16 06:52:23 UTC 2018 - axel.braun@gmx.de diff --git a/gnuhealth-client.spec b/gnuhealth-client.spec index 6f601c2..68e1452 100644 --- a/gnuhealth-client.spec +++ b/gnuhealth-client.spec @@ -13,23 +13,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define majorver 3.4 +%define majorver 3.2 Name: gnuhealth-client -Version: %{majorver}.1 +Version: %{majorver}.6 Release: 0 Summary: The client of the GNU Health Hospital system -License: GPL-3.0-only +License: GPL-3.0 Group: Productivity/Office/Management 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-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 +Source: https://ftp.gnu.org/gnu/health/%{name}-%{version}.tar.gz +Source1: ftp://ftp.gnu.org/gnu/health/plugins/gnuhealth-camera-plugin-latest.tar.gz +Source2: %{name}.desktop +Patch0: gnuhealth_crypto.patch BuildRequires: fdupes BuildRequires: python-Babel BuildRequires: python-Sphinx @@ -40,7 +39,7 @@ BuildRequires: python-python-dateutil BuildRequires: python-setuptools BuildRequires: python-simplejson BuildRequires: update-desktop-files -#Requires: librsvg +Requires: librsvg #for the plugins: Requires: opencv Requires: python-GooCalendar @@ -63,17 +62,12 @@ The client of the GNU Health Hospital application %prep %setup -q -cp %{SOURCE4} . +%patch0 -p1 +cp %{SOURCE2} . pwd -cd tryton/plugins/ -#tar --strip-components 1 -xzvf %{SOURCE1} -#tar --strip-components 1 -xzvf %{SOURCE2} -#tar --strip-components 1 -xzvf %{SOURCE3} - -tar -xzvf %{SOURCE1} -tar -xzvf %{SOURCE2} -tar -xzvf %{SOURCE3} +cd %{name}/plugins/ +tar --strip-components 1 -xzvf %{SOURCE1} %build : @@ -88,8 +82,8 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop 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 +%fdupes %{buildroot}%{_datadir} +%fdupes %{buildroot}%{_prefix}/lib %post %desktop_database_post @@ -102,8 +96,7 @@ cp %{buildroot}%{python_sitelib}/tryton/data/pixmaps/tryton/gnuhealth-icon.png % %files %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%doc Changelog -%license COPYRIGHT COPYING +%doc COPYRIGHT COPYING COPYRIGHT Changelog %{_datadir}/pixmaps/* %{python_sitelib}/* diff --git a/gnuhealth_plugin_camera-latest.tar.gz b/gnuhealth_plugin_camera-latest.tar.gz deleted file mode 100644 index 90c48a5..0000000 --- a/gnuhealth_plugin_camera-latest.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_crypto-latest.tar.gz b/gnuhealth_plugin_crypto-latest.tar.gz index e3c15d6..6ab245f 100644 --- a/gnuhealth_plugin_crypto-latest.tar.gz +++ b/gnuhealth_plugin_crypto-latest.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5c10e183c07e7352fc8947772b0ae51752dad8da92d8306628646d870ca692f -size 2772 +oid sha256:3de543edfaa8aa9060cc2f82fb8bfc408689859926e2104758897390caa01fb2 +size 2814 diff --git a/gnuhealth_plugin_frl-latest.tar.gz b/gnuhealth_plugin_frl-latest.tar.gz deleted file mode 100644 index 67e1bda..0000000 --- a/gnuhealth_plugin_frl-latest.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d6cfff08175ca88b901f38e957e2083407675c897c1d31f5a856538f1a9425c -size 11042