Accepting request 316014 from home:scarabeus_iv:branches:server:database

- Sync to git state, fixes bnc#937754 too

OBS-URL: https://build.opensuse.org/request/show/316014
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=178
This commit is contained in:
Martin Pluskal 2015-07-11 12:26:45 +00:00 committed by Git OBS Bridge
parent 18bf970597
commit 986c00b139
4 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4daef1c77b163a4b79600d0a441aa84603d62c12515f79c5fd82da2c82e43075 oid sha256:d06d18f5c8475f73d299dfe2492b37d721f993751e7ac487cc24d589972ec8ea
size 319 size 313

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Jul 11 12:25:05 UTC 2015 - tchvatal@suse.com
- Sync to git state, fixes bnc#937754 too
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 7 09:24:09 UTC 2015 - tchvatal@suse.com Tue Jul 7 09:24:09 UTC 2015 - tchvatal@suse.com

View File

@ -555,9 +555,9 @@ done
# and thus broken later on. Fixes bnc#906147 # and thus broken later on. Fixes bnc#906147
pushd "%{buildroot}%{_libdir}" pushd "%{buildroot}%{_libdir}"
rm -f lib%{libname}_r.so* rm -f lib%{libname}_r.so*
ln -sf lib%{libname}%{soname}.so.%{soname}.0.0 lib%{libname}_r.so ln -sf lib%{libname}.so.%{soname}.0.0 lib%{libname}_r.so
ln -sf lib%{libname}%{soname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname} ln -sf lib%{libname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname}
ln -sf lib%{libname}%{soname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname}.0.0 ln -sf lib%{libname}.so.%{soname}.0.0 lib%{libname}_r.so.%{soname}.0.0
popd popd
# If not preffered simply reduce main develpackage to NULL # If not preffered simply reduce main develpackage to NULL
@ -632,7 +632,7 @@ usermod -g mysql -s /bin/false mysql
/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || : /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || :
# SLE11 Migration support # SLE11 Migration support
for in 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 # Remove any messages that could've been in place about the upgrade

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d5ddecfa457d15482f6bcfa469278e89d164bb86bb1a02519a15218e056d1f40 oid sha256:4a402573f978d63eef12baaa5e15af4a13a913b95b18fd70f75b6600ba416c1f
size 16518 size 16529