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