Accepting request 817275 from home:rmax:branches:server:database:postgresql

- Also conflict with PostgreSQL versions before 9.
- Add compat definition for the tmpfiles_create macro.
- Conflicting with older versions is not limited to SLE.

OBS-URL: https://build.opensuse.org/request/show/817275
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=124

postgresql.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 26 13:49:21 UTC 2020 - Reinhard Max <max@suse.com>
+
+- Also conflict with PostgreSQL versions before 9.
+- Add compat definition for the tmpfiles_create macro.
+- Conflicting with older versions is not limited to SLE.
+
 -------------------------------------------------------------------
 Tue Jun 16 12:17:33 UTC 2020 - Reinhard Max <max@suse.com>
 

postgresql.spec

@@ -16,13 +16,22 @@
 #
 
 %define pgmajor 12
-%define defaultpackage postgresql%version
+%define defaultpackage postgresql%pgmajor
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
+#Compat macro for tmpfiles_create which doesn't exist on SLE12 before SP2
+%if ! %{defined tmpfiles_create}
+%define tmpfiles_create() \
+[ -z "${TRANSACTIONAL_UPDATE}" -a -x /usr/bin/systemd-tmpfiles ] && \
+        /usr/bin/systemd-tmpfiles --create %{?*} || : \
+%{nil}
+
+%endif
+
 %if 0%{?suse_version} >= 1300
 %bcond_without  systemd
 %else
@@ -48,9 +57,9 @@ Provides:       postgresql-noarch = %version-%release
 Requires:       postgresql-implementation
 Requires:       update-alternatives
 Recommends:     %defaultpackage
-%if 0%{?sle_version}
-# At this point we changed the package layout on SLE and conflict with
-# older releases to get a clean cut.
+# In June 2020 we changed the package layout for PostgreSQL and
+# conflict with older releases to get a clean cut-over.
+Conflicts:      postgresql < 9
 Conflicts:      postgresql90
 Conflicts:      postgresql91
 Conflicts:      postgresql92
@@ -61,7 +70,6 @@ Conflicts:      postgresql96 < 9.6.18
 Conflicts:      postgresql10 < 10.13
 Conflicts:      postgresql11 < 11.8
 Conflicts:      postgresql12 < 12.3
-%endif
 BuildArch:      noarch
 Source0:        postgresql-init
 Source1:        postgresql-sysconfig