SHA256
1
0
forked from pool/trytond

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
This commit is contained in:
Axel Braun 2018-06-12 19:06:26 +00:00 committed by Git OBS Bridge
parent d471d26191
commit f963ba178b
2 changed files with 13 additions and 6 deletions

View File

@ -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 Mon Jun 11 09:20:09 UTC 2018 - axel.braun@gmx.de

View File

@ -2,7 +2,7 @@
# spec file for package trytond # spec file for package trytond
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -45,9 +45,10 @@ BuildRequires: python3-psycopg2
BuildRequires: python3-pydot3 BuildRequires: python3-pydot3
BuildRequires: python3-python-sql BuildRequires: python3-python-sql
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
#BuildRequires: python3-simplejson
BuildRequires: python3-wrapt BuildRequires: python3-wrapt
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: postgresql
BuildRequires: postgresql96-server
Requires: libreoffice-pyuno Requires: libreoffice-pyuno
Requires: postgresql96-server Requires: postgresql96-server
Requires: python3-Genshi Requires: python3-Genshi
@ -67,12 +68,12 @@ Requires: python3-wrapt
Requires: unoconv Requires: unoconv
Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
# Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
Conflicts: postgresql10-server
Conflicts: postgresql10
%{?systemd_requires} %{?systemd_requires}
%description %description
@ -113,7 +114,8 @@ getent passwd tryton > /dev/null || %{_sbindir}/useradd -r -g tryton \
%post %post
%service_add_post trytond.service %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 %preun
%service_del_preun trytond.service %service_del_preun trytond.service