rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 233911 from server:database

Browse Source 
- use %_rundir if available (forwarded request 233818 from coolo)

OBS-URL: https://build.opensuse.org/request/show/233911
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=36
This commit is contained in:
Stephan Kulow 2014-05-22 18:38:08 +00:00 committed by Git OBS Bridge
commit b35354a2d2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mariadb.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 14 05:45:51 UTC 2014 - coolo@suse.com
- use %_rundir if available
-------------------------------------------------------------------
Wed Nov 13 17:40:37 UTC 2013 - klaussfreire@gmail.com

12
mariadb.spec
View File

@ -24,6 +24,10 @@
%define use_extra_provides 1
%define extra_provides mariadb_55
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
%if %{?rel:0}%{!?rel:1}
%define rel 1
%endif
@ -451,7 +455,7 @@ if posix.access("/usr/sbin/rcmysql", "x") then
os.execute("/usr/sbin/rcmysql stop")
if restart == 0 then
os.execute("/bin/mkdir -p /var/run/mysql/restart")
os.execute("/bin/mkdir -p %{_rundir}/mysql/restart")
end
end
@ -468,9 +472,9 @@ for i in /var/lib/mysql/{.protected,.tmp}; do
( [ -d "$i" ] && rmdir "$i" ) || :
done
# start mysql again if it should run
if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d /var/run/mysql/restart ]; then
if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d %{_rundir}/mysql/restart ]; then
[ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql start
rmdir /var/run/mysql/restart || :
rmdir %{_rundir}/mysql/restart || :
fi
#######################################################################
@ -529,7 +533,7 @@ fi
%dir /usr/share/mysql
/usr/share/%{name}/charsets/
/usr/share/%{name}/*.sql
%ghost %dir %attr(755,mysql,mysql)/var/run/mysql
%ghost %dir %attr(755,mysql,mysql)%{_rundir}/mysql
%dir %{_libdir}/mysql
%{_libdir}/mysql/mysqld.sym
%config /etc/sysconfig/SuSEfirewall2.d/services/mysql