From 9845ccbea198d6071d8356e051c309b68804283cd94d597d467e6ab0db1e0556 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 5 Jun 2018 13:10:57 +0000 Subject: [PATCH 01/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=15 --- trytond.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/trytond.spec b/trytond.spec index 8c63e47..63149c0 100644 --- a/trytond.spec +++ b/trytond.spec @@ -48,13 +48,10 @@ BuildRequires: python3-setuptools BuildRequires: python3-simplejson BuildRequires: python3-wrapt BuildRequires: systemd-rpm-macros -Requires: postgresql96-server +Requires: postgresql96-server < 10 Requires: python3-Genshi Requires: python3-lxml Requires: python3-psycopg2 -#Requires: python3-pytz -#Requires: python3-pyOpenSSL -#Requires: python3-egenix-mx-base Requires: libreoffice-pyuno Requires: python3-Levenshtein Requires: python3-dateutil @@ -62,7 +59,6 @@ Requires: python3-polib Requires: python3-python-sql Requires: python3-relatorio Requires: unoconv -#Requires: python3-PyWebDAV Requires: python3-Sphinx Requires: python3-Werkzeug Requires: python3-bcrypt @@ -73,6 +69,7 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %{?systemd_requires} %description From 5c79a952ce11544328e141853fbd83d74bdbb6ba4d3716159c2019b289983009 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 5 Jun 2018 13:11:48 +0000 Subject: [PATCH 02/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=16 --- trytond.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/trytond.changes b/trytond.changes index 195a22d..82fa115 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 5 13:11:10 UTC 2018 - axel.braun@gmx.de + +- requirement for postgres96 improved + copyright to log file added + ------------------------------------------------------------------- Sat May 12 12:59:31 UTC 2018 - axel.braun@gmx.de From 841e230695bdc47530043753f0689b6a494517d0e7824bbfda40c36217409b68 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 5 Jun 2018 13:14:01 +0000 Subject: [PATCH 03/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=17 --- trytond_log.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/trytond_log.conf b/trytond_log.conf index 0d46e3d..54a6fa0 100644 --- a/trytond_log.conf +++ b/trytond_log.conf @@ -1,5 +1,7 @@ # /etc/tryton/trytond_log.conf - Logging configuration file for Tryton Server (trytond) # +# Copyright (c) 2016 Mathias Behrle +# # This file contains settings for trytond to rotate logs daily and # to keep 30 logs. From d69f0a2fa84f419d0f44a5b8917f5d1d86952f723dc486e186f38885cad6d2de Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 5 Jun 2018 13:34:48 +0000 Subject: [PATCH 04/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=18 --- trytond.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trytond.spec b/trytond.spec index 63149c0..e746c27 100644 --- a/trytond.spec +++ b/trytond.spec @@ -45,7 +45,7 @@ BuildRequires: python3-psycopg2 BuildRequires: python3-pydot3 BuildRequires: python3-python-sql BuildRequires: python3-setuptools -BuildRequires: python3-simplejson +#BuildRequires: python3-simplejson BuildRequires: python3-wrapt BuildRequires: systemd-rpm-macros Requires: postgresql96-server < 10 From 99d0ba99180cc43c63b5bb8f21b76bcd2ed2fea5dc1ab19e1e034177e4f3f2e4 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 8 Jun 2018 10:48:09 +0000 Subject: [PATCH 05/11] Accepting request 615204 from home:DocB:branches:Application:ERP:GNUHealth:Factory - boo#1096706 requirement for postgres96 fixed copyright to log file added - Version 4.2.11 - Bugfix Release - requires postgres96, otherwise trytond-admin fails (Leap 15) - Version 4.2.10 - Bugfix Release - user_login.patch replaced by trytond_get_login.patch see boo#1078111 - Version 4.2.9 - Bugfix Release - Version 4.2.8 - Bugfix Release - Version 4.2.7 - Bugfix Release - Documentation updated - Version 4.2.6 bugfix release typo in trytond.conf removed - default setting for database access in trytond.conf - Version 4.2.5 - Patch for user login user_login.patch from GNU Health 3.20 applied trytond_server.diff removed as not needed anymore - Version 4.2.4 - Version 4.2.3 - Version 4.2.2 - Version 4.2.1 - Tryton Release 4.2 - Update description - Add missing %service_add_pre and convert open-coded other three scriptlets to %service_*. - version 4.0.2 - Tryton Release 4.0 - patch for security vulnerability applied, see https://savannah.gnu.org/forum/forum.php?forum_id=8482 - Installation of sao (webfrontend) documented - Tryton Release 3.8 - version 3.6.1 * clean up of specfile - Tryton Release 3.6 - sample file for confirguration added (trytond.conf.example) tryton-server.README.SUSE updated - systemd startup file corrected, sample file for log config added - added trytond.conf - version 3.4 - new branch 3.0, added python-sql - Tryton 3.0, spec file adapted * - new spec with regard to systemd - setup of user tryton if not existing * - packaged tryton version 1.0.3 using the buildservice spec file wizard OBS-URL: https://build.opensuse.org/request/show/615204 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=19 --- trytond.changes | 4 ++-- trytond.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/trytond.changes b/trytond.changes index 82fa115..09b2788 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Jun 5 13:11:10 UTC 2018 - axel.braun@gmx.de +Fri Jun 8 10:41:08 UTC 2018 - axel.braun@gmx.de -- requirement for postgres96 improved +- boo#1096706 requirement for postgres96 fixed copyright to log file added ------------------------------------------------------------------- diff --git a/trytond.spec b/trytond.spec index e746c27..babd6aa 100644 --- a/trytond.spec +++ b/trytond.spec @@ -48,7 +48,7 @@ BuildRequires: python3-setuptools #BuildRequires: python3-simplejson BuildRequires: python3-wrapt BuildRequires: systemd-rpm-macros -Requires: postgresql96-server < 10 +Requires: postgresql96-server Requires: python3-Genshi Requires: python3-lxml Requires: python3-psycopg2 @@ -70,6 +70,9 @@ Requires(pre): /usr/sbin/useradd BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +Conflicts: postgresql10-server +Conflicts: postgresql10 + %{?systemd_requires} %description @@ -102,14 +105,15 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/%{base_name} %fdupes -s %{buildroot} %pre -getent group tryton > /dev/null || %{_sbindir}/groupadd -r tryton || : +getent group tryton > /dev/null || %{_sbindir}/groupadd -r tryton getent passwd tryton > /dev/null || %{_sbindir}/useradd -r -g tryton \ -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \ - -c 'Tryton ERP' tryton || : + -c 'Tryton ERP' tryton %service_add_pre trytond.service %post %service_add_post trytond.service +##update-alternatives --set postgresql /usr/lib/postgresql96 %preun %service_del_preun trytond.service From 6731707e43e1483a16bcabedf032b804df97feb874f7a1ebd13afa02b6011063 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Mon, 11 Jun 2018 09:20:40 +0000 Subject: [PATCH 06/11] Update to trytond Version 4.2.12 - Bugfix Release OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=20 --- trytond-4.2.11.tar.gz | 3 --- trytond-4.2.12.tar.gz | 3 +++ trytond.changes | 5 +++++ trytond.spec | 22 +++++++++++----------- 4 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 trytond-4.2.11.tar.gz create mode 100644 trytond-4.2.12.tar.gz diff --git a/trytond-4.2.11.tar.gz b/trytond-4.2.11.tar.gz deleted file mode 100644 index 36c1723..0000000 --- a/trytond-4.2.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1aff7772037e2898886091511049c5e83e4e45891db23c97cd1b3f912414b8c4 -size 588359 diff --git a/trytond-4.2.12.tar.gz b/trytond-4.2.12.tar.gz new file mode 100644 index 0000000..4b51a5b --- /dev/null +++ b/trytond-4.2.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dac5d5e29fd7d2e7a34ec0e4688c485162765f5abb5ae8d39b66c12d2fac38e9 +size 588443 diff --git a/trytond.changes b/trytond.changes index 09b2788..340e3f1 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 11 09:20:09 UTC 2018 - axel.braun@gmx.de + +- Version 4.2.12 - Bugfix Release + ------------------------------------------------------------------- Fri Jun 8 10:41:08 UTC 2018 - axel.braun@gmx.de diff --git a/trytond.spec b/trytond.spec index babd6aa..d498f8d 100644 --- a/trytond.spec +++ b/trytond.spec @@ -20,7 +20,7 @@ %define majorver 4.2 %define base_name tryton Name: trytond -Version: %{majorver}.11 +Version: %{majorver}.12 Release: 0 Summary: An Enterprise Resource Planning (ERP) system @@ -48,30 +48,30 @@ BuildRequires: python3-setuptools #BuildRequires: python3-simplejson BuildRequires: python3-wrapt BuildRequires: systemd-rpm-macros +Requires: libreoffice-pyuno Requires: postgresql96-server Requires: python3-Genshi -Requires: python3-lxml -Requires: python3-psycopg2 -Requires: libreoffice-pyuno Requires: python3-Levenshtein -Requires: python3-dateutil -Requires: python3-polib -Requires: python3-python-sql -Requires: python3-relatorio -Requires: unoconv Requires: python3-Sphinx Requires: python3-Werkzeug Requires: python3-bcrypt +Requires: python3-dateutil +Requires: python3-lxml Requires: python3-mock +Requires: python3-polib +Requires: python3-psycopg2 +Requires: python3-python-sql +Requires: python3-relatorio Requires: python3-simpleeval Requires: python3-wrapt +Requires: unoconv Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Conflicts: postgresql10-server -Conflicts: postgresql10 +Conflicts: postgresql10-server +Conflicts: postgresql10 %{?systemd_requires} From a5766245d1a3bc4fb8a404ced8246d7f91c177b1a68d52c0d318f435755bab28 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Mon, 11 Jun 2018 09:22:11 +0000 Subject: [PATCH 07/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=21 --- trytond.changes | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/trytond.changes b/trytond.changes index 340e3f1..dc9c9de 100644 --- a/trytond.changes +++ b/trytond.changes @@ -2,12 +2,8 @@ Mon Jun 11 09:20:09 UTC 2018 - axel.braun@gmx.de - Version 4.2.12 - Bugfix Release - -------------------------------------------------------------------- -Fri Jun 8 10:41:08 UTC 2018 - axel.braun@gmx.de - -- boo#1096706 requirement for postgres96 fixed - copyright to log file added + boo#1096706 requirement for postgres96 fixed + copyright to log file and readme added ------------------------------------------------------------------- Sat May 12 12:59:31 UTC 2018 - axel.braun@gmx.de From c5b492643ede1a6270d3e1f428d5d84098e1dee1486ffd25616243a2f43688d3 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Mon, 11 Jun 2018 09:26:25 +0000 Subject: [PATCH 08/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=22 --- tryton-server.README.SUSE | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tryton-server.README.SUSE b/tryton-server.README.SUSE index 4ef7adf..2cb967c 100644 --- a/tryton-server.README.SUSE +++ b/tryton-server.README.SUSE @@ -247,3 +247,8 @@ Now, you're finished with the system setup. Please be aware of the following thi * Only the same major version of Tryton client and Tryton server can connect. -- Axel Braun THU Sep 14 19:24:07 UTC 2017 + + +This file was based on the readme.Debian +Copyright: 2009-2012 Daniel Baumann + 2011-2014 Mathias Behrle \ No newline at end of file From 2039466cb834ddc559184dc2f67c09ff352e5151b3b78d8a43cfdede61b2afeb Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Mon, 11 Jun 2018 09:29:12 +0000 Subject: [PATCH 09/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=23 --- tryton-server.README.SUSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tryton-server.README.SUSE b/tryton-server.README.SUSE index 2cb967c..9876673 100644 --- a/tryton-server.README.SUSE +++ b/tryton-server.README.SUSE @@ -246,9 +246,9 @@ Now, you're finished with the system setup. Please be aware of the following thi * Only the same major version of Tryton client and Tryton server can connect. - -- Axel Braun THU Sep 14 19:24:07 UTC 2017 + -- Axel Braun MON Jun 11 10:27:14 UTC 2018 -This file was based on the readme.Debian +This file is based on tryton-server.README.Debian Copyright: 2009-2012 Daniel Baumann 2011-2014 Mathias Behrle \ No newline at end of file From d471d2619161e29f0321fd22a4436bfa50fdd626f54f2210b08cfde5da52bca5 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Mon, 11 Jun 2018 09:31:07 +0000 Subject: [PATCH 10/11] OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=24 --- trytond.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/trytond.changes b/trytond.changes index dc9c9de..ae03c32 100644 --- a/trytond.changes +++ b/trytond.changes @@ -4,6 +4,7 @@ Mon Jun 11 09:20:09 UTC 2018 - axel.braun@gmx.de - Version 4.2.12 - Bugfix Release boo#1096706 requirement for postgres96 fixed copyright to log file and readme added + Specfile cleaned up ------------------------------------------------------------------- Sat May 12 12:59:31 UTC 2018 - axel.braun@gmx.de From f963ba178be96b76b0abe10e596f2e97a09189f7545f61a848308e6d1cdb0659 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Tue, 12 Jun 2018 19:06:26 +0000 Subject: [PATCH 11/11] Accepting request 616373 from home:DocB:branches:Application:ERP:GNUHealth:Factory - boo#1096706 set postgres96 using update-alternatives (openQA failure) OBS-URL: https://build.opensuse.org/request/show/616373 OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=25 --- trytond.changes | 5 +++++ trytond.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/trytond.changes b/trytond.changes index ae03c32..3e47d71 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 12 19:04:04 UTC 2018 - axel.braun@gmx.de + +- boo#1096706 set postgres96 using update-alternatives (openQA failure) + ------------------------------------------------------------------- Mon Jun 11 09:20:09 UTC 2018 - axel.braun@gmx.de diff --git a/trytond.spec b/trytond.spec index d498f8d..1e4669d 100644 --- a/trytond.spec +++ b/trytond.spec @@ -2,7 +2,7 @@ # spec file for package trytond # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2015, 2016 Dr. Axel Braun +# Copyright (c) 2015 - 2018 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,9 +45,10 @@ BuildRequires: python3-psycopg2 BuildRequires: python3-pydot3 BuildRequires: python3-python-sql BuildRequires: python3-setuptools -#BuildRequires: python3-simplejson BuildRequires: python3-wrapt BuildRequires: systemd-rpm-macros +BuildRequires: postgresql +BuildRequires: postgresql96-server Requires: libreoffice-pyuno Requires: postgresql96-server Requires: python3-Genshi @@ -67,12 +68,12 @@ Requires: python3-wrapt Requires: unoconv Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +# Post requires update-alternatives to install tool update-alternatives. +Requires(post): update-alternatives + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Conflicts: postgresql10-server -Conflicts: postgresql10 - %{?systemd_requires} %description @@ -113,7 +114,8 @@ getent passwd tryton > /dev/null || %{_sbindir}/useradd -r -g tryton \ %post %service_add_post trytond.service -##update-alternatives --set postgresql /usr/lib/postgresql96 +# Postgresql 96 is required for tryton series 4.2.x! +update-alternatives --set postgresql /usr/lib/postgresql96 %preun %service_del_preun trytond.service