Accepting request 735633 from server:database:postgresql

- Use the correct content for .bash_profile (boo#1153168).
- Stop shipping SUSEfirewall2 config files (bsc#1151591).
- Fix installation of bash_profile for SLE11 (pre systemd).

OBS-URL: https://build.opensuse.org/request/show/735633
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postgresql?expand=0&rev=55

postgresql.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct  7 08:26:39 UTC 2019 - Reinhard Max <max@suse.com>
+
+- Use the correct content for .bash_profile (boo#1153168).
+
+-------------------------------------------------------------------
+Mon Sep 23 14:03:32 UTC 2019 - Reinhard Max <max@suse.com>
+
+- Stop shipping SUSEfirewall2 config files (bsc#1151591).
+- Fix installation of bash_profile for SLE11 (pre systemd).
+
 -------------------------------------------------------------------
 Fri Feb 22 07:46:53 UTC 2019 - Franck Bui <fbui@suse.com>
 

postgresql.spec

@@ -273,16 +273,18 @@ mkdir -p %buildroot/var/run/postgresql
 install -m755 -d %buildroot%{_fillupdir}
 install -m644 %{S:1} %buildroot%{_fillupdir}/sysconfig.postgresql
 
+%if 0%{?suse_version} < 1550
 install -m755 -d %buildroot%fwdir
 install -m644 %{S:2} %buildroot%fwdir/%fwname
+%endif
 
 install -m755 -d %buildroot/usr/sbin
 
 install -m755 -d %buildroot/usr/share/postgresql
-install -m640 %{S:7} %buildroot/usr/share/postgresql/bash_profile
 install -m755 %{S:7} %buildroot/usr/share/postgresql/install-alternatives
 
 %if %{with systemd}
+install -m644 %{S:5} %buildroot/usr/share/postgresql/bash_profile
 install -m755 -d %buildroot/%_tmpfilesdir
 install -m644 %{S:3} %buildroot%_tmpfilesdir/postgresql.conf
 install -m755 %{S:6} %buildroot/usr/share/postgresql
@@ -292,6 +294,7 @@ install -m444 %{S:4} %buildroot%_unitdir
 
 ln -sf service %buildroot/usr/sbin/rcpostgresql
 %else
+install -m640 %{S:5} %buildroot/var/lib/pgsql/.bash_profile
 install -m755 -d %buildroot/etc/init.d
 install -m755 %{S:0} %buildroot/etc/init.d/postgresql
 ln -sf /etc/init.d/postgresql %buildroot/usr/sbin/rcpostgresql
@@ -370,13 +373,19 @@ fi
 %defattr(-,root,root,-)
 %doc README
 %attr(750,postgres,postgres) %dir /var/lib/pgsql
+%if %{with systemd}
 %attr(644,root,root) /usr/share/postgresql/bash_profile
 %ghost %config %attr(640,postgres,postgres) /var/lib/pgsql/.bash_profile
+%else
+%config %attr(640,postgres,postgres) /var/lib/pgsql/.bash_profile
+%endif
 
+%if 0%{?suse_version} < 1550
 %if 0%{?suse_version} > 1110
 %dir %fwdir
 %endif
 %config %fwdir/%fwname
+%endif
 
 %{_fillupdir}/sysconfig.postgresql
 /usr/sbin/rcpostgresql