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