Accepting request 554763 from home:bruno_friedmann:branches:server:database:postgresql

- Replace references to /var/adm/fillup-templates with new 
  %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/554763
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=98
This commit is contained in:
Bruno Friedmann 2017-12-12 15:43:28 +00:00 committed by Git OBS Bridge
parent 15a35fecca
commit de0278567f
2 changed files with 15 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 6 10:32:06 UTC 2017 - bruno@ioda-net.ch
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Fri Nov 24 11:24:09 UTC 2017 - mrueckert@suse.de

View File

@ -17,6 +17,11 @@
%define defaultpackage postgresql10
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%if 0%{?suse_version} >= 1300
%bcond_without systemd
%else
@ -225,8 +230,8 @@ echo "This is a dummy package to provide a dependency on the default PostgreSQL
mkdir -p %buildroot/var/lib/pgsql/
install -m640 %{SOURCE5} %buildroot/var/lib/pgsql/.bash_profile
install -m755 -d %buildroot/var/adm/fillup-templates
install -m644 %{S:1} %buildroot/var/adm/fillup-templates/sysconfig.postgresql
install -m755 -d %buildroot%{_fillupdir}
install -m644 %{S:1} %buildroot%{_fillupdir}/sysconfig.postgresql
install -m755 -d %buildroot%fwdir
install -m644 %{S:2} %buildroot%fwdir/%fwname
@ -330,7 +335,8 @@ fi
%dir %fwdir
%endif
%config %fwdir/%fwname
/var/adm/fillup-templates/sysconfig.postgresql
%{_fillupdir}/sysconfig.postgresql
/usr/sbin/rcpostgresql
%if %{with systemd}
%_tmpfilesdir/postgresql.conf