diff --git a/tryton-server.README.SUSE b/tryton-server.README.SUSE index 4ef7adf..9876673 100644 --- a/tryton-server.README.SUSE +++ b/tryton-server.README.SUSE @@ -246,4 +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 is based on tryton-server.README.Debian +Copyright: 2009-2012 Daniel Baumann + 2011-2014 Mathias Behrle \ No newline at end of file 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 195a22d..3e47d71 100644 --- a/trytond.changes +++ b/trytond.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 + +- 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 diff --git a/trytond.spec b/trytond.spec index 8c63e47..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 @@ -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 @@ -45,34 +45,35 @@ 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 -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 -Requires: python3-polib -Requires: python3-python-sql -Requires: python3-relatorio -Requires: unoconv -#Requires: python3-PyWebDAV 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 +# Post requires update-alternatives to install tool update-alternatives. +Requires(post): update-alternatives + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %{?systemd_requires} %description @@ -105,14 +106,16 @@ 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 +# Postgresql 96 is required for tryton series 4.2.x! +update-alternatives --set postgresql /usr/lib/postgresql96 %preun %service_del_preun trytond.service 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.