pool/mariadb
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 559392 from home:dimstar:Factory

Browse Source 
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
This commit is contained in:
Kristyna Streitova 2017-12-22 17:13:00 +00:00 committed by Git OBS Bridge
parent 18c2992223
commit fdaed8a1fe
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mariadb.changes
View File

@ -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 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-release-notes/
* https://mariadb.com/kb/en/library/mariadb-10211-changelog/ * https://mariadb.com/kb/en/library/mariadb-10211-changelog/
- pack additional mroonga/groonga files - 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] [fate#324329]
- remove mariadb-10.2.10-wsrep_sst_common.patch as it's no longer - remove mariadb-10.2.10-wsrep_sst_common.patch as it's no longer
needed needed

7
mariadb.spec
View File

@ -673,15 +673,12 @@ getent passwd mysql | cut -d: -f7 | grep '\b/bin/false\b' &>/dev/null || usermod
%post %post
%service_add_post mysql.service %service_add_post mysql.service
# Use %%tmpfiles_create when 13.2 is oldest in support scope %tmpfiles_create %{_tmpfilesdir}/mysql.conf
%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || :
# SLE11 Migration support # SLE11 Migration support
for i in protected tmp; do for i in protected tmp; do
rmdir "$datadir"/.$i 2>/dev/null || : rmdir "$datadir"/.$i 2>/dev/null || :
done 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), # During package rename (migration maria->mysql-community-server),
# there might be config file move and we get rpmsave that we should keep # there might be config file move and we get rpmsave that we should keep
@ -735,8 +732,6 @@ exit 0
%postun %postun
%service_del_postun mysql.service %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 %post -n libmysqld%{soname} -p /sbin/ldconfig
%postun -n libmysqld%{soname} -p /sbin/ldconfig %postun -n libmysqld%{soname} -p /sbin/ldconfig