From d2c1faa7bccedb23f492a42b56072ca664042f67e55009c08fbbafe06c7e4c62 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 8 Jan 2021 13:27:01 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=109 --- trytond.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trytond.spec b/trytond.spec index 98ce931..e26b126 100644 --- a/trytond.spec +++ b/trytond.spec @@ -2,7 +2,7 @@ # spec file for package trytond # # Copyright (c) 2021 SUSE LLC -# Copyright (c) 2015 2017 Dr. Axel Braun +# 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 From 39207a21cea71fcdadc282b6685725c0c270bd0eb03ec7a7c200bced54698df0 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Sun, 24 Jan 2021 16:24:55 +0000 Subject: [PATCH 2/2] - Adaption to new systemd and python macros OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=110 --- trytond.changes | 5 +++++ trytond.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/trytond.changes b/trytond.changes index 89acbf1..850b654 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 24 16:24:17 UTC 2021 - Axel Braun + +- Adaption to new systemd and python macros + ------------------------------------------------------------------- Fri Jan 1 18:41:53 UTC 2021 - Axel Braun diff --git a/trytond.spec b/trytond.spec index e26b126..27013e0 100644 --- a/trytond.spec +++ b/trytond.spec @@ -43,7 +43,7 @@ BuildRequires: python3-pydot3 BuildRequires: python3-python-sql BuildRequires: python3-setuptools BuildRequires: python3-wrapt -BuildRequires: systemd-rpm-macros + Requires: html2text Requires: libreoffice-pyuno Requires: postgresql-server @@ -65,7 +65,7 @@ Requires: unoconv Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd BuildArch: noarch -%{?systemd_requires} +%{?systemd_ordering} %description This package contains the server of the Tryton application platform, @@ -82,10 +82,11 @@ cp %{SOURCE2} . %patch1 -p1 %build -python3 setup.py build +%python3_build %install -python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python3_install --prefix=%{_prefix} --root=%{buildroot} + # only for systemd mkdir -p %{buildroot}%{_sysconfdir}/%{base_name} install -p -m 640 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{base_name}/%{name}.conf