From fdaed8a1fef907de23f4852d8ccce51cc0e6bfd52bcdcd9d3f7597b5b57cb443 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Fri, 22 Dec 2017 17:13:00 +0000 Subject: [PATCH] Accepting request 559392 from home:dimstar:Factory Happens to fix build with RPM 4.14, which got quite a bit stricter, see Staging:A OBS-URL: https://build.opensuse.org/request/show/559392 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=202 --- mariadb.changes | 11 ++++++++++- mariadb.spec | 7 +------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mariadb.changes b/mariadb.changes index c5d4f9c..f775e80 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Dec 21 12:42:28 UTC 2017 - dimstar@opensuse.org + +- Do not manually delete + %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something: + The file is listed as ghost and thus properly owned by the + package. +- Use %tmpfiles_create which can cope with transactional updates. + ------------------------------------------------------------------- Thu Nov 30 07:53:14 UTC 2017 - kstreitova@suse.com @@ -6,7 +15,7 @@ Thu Nov 30 07:53:14 UTC 2017 - kstreitova@suse.com * https://mariadb.com/kb/en/library/mariadb-10211-release-notes/ * https://mariadb.com/kb/en/library/mariadb-10211-changelog/ - pack additional mroonga/groonga files -- change default charset to utf8mb4 for full Unicode support +- change default charset to utf8mb4 for full Unicode support [fate#324329] - remove mariadb-10.2.10-wsrep_sst_common.patch as it's no longer needed diff --git a/mariadb.spec b/mariadb.spec index 0b8e679..c5e1f27 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -673,15 +673,12 @@ getent passwd mysql | cut -d: -f7 | grep '\b/bin/false\b' &>/dev/null || usermod %post %service_add_post mysql.service -# Use %%tmpfiles_create when 13.2 is oldest in support scope -%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || : +%tmpfiles_create %{_tmpfilesdir}/mysql.conf # SLE11 Migration support for i in protected tmp; do rmdir "$datadir"/.$i 2>/dev/null || : done -# Remove any messages that could've been in place about the upgrade -rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something # During package rename (migration maria->mysql-community-server), # there might be config file move and we get rpmsave that we should keep @@ -735,8 +732,6 @@ exit 0 %postun %service_del_postun mysql.service -# Remove the /var/adm updatemsg that was hand-created and thus not on filelist -rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something %post -n libmysqld%{soname} -p /sbin/ldconfig %postun -n libmysqld%{soname} -p /sbin/ldconfig