rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not use scl prefix more than once in paths

Browse Source 
Based on https://www.redhat.com/archives/sclorg/2015-February/msg00038.html

Conflicts:
	mariadb.spec
	my.cnf.in
This commit is contained in:
Honza Horak 2015-03-03 21:28:20 +01:00
parent 4568299fc7
commit fa8f2eb58c
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mariadb-ownsetup.patch
View File

@ -13,7 +13,7 @@ diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/s
+datadir=@MYSQL_DATADIR@ +datadir=@MYSQL_DATADIR@
+socket=@MYSQL_UNIX_ADDR@ +socket=@MYSQL_UNIX_ADDR@
+log-error=@LOG_LOCATION@ +log-error=@LOG_LOCATION@
+pid-file=@PID_FILE_DIR@/@DAEMON_NAME@.pid +pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid
+ +
# this is only for embedded server # this is only for embedded server

14
mariadb.spec
View File

@ -69,12 +69,14 @@
%bcond_with init_sysv %bcond_with init_sysv
%global daemon_name %{name} %global daemon_name %{name}
%global daemondir %{_unitdir} %global daemondir %{_unitdir}
%global daemon_no_prefix %{pkg_name}
%global mysqld_pid_dir mysqld %global mysqld_pid_dir mysqld
%else %else
%bcond_with init_systemd %bcond_with init_systemd
%bcond_without init_sysv %bcond_without init_sysv
%global daemon_name mysqld %global daemon_name mysqld
%global daemondir %{_sysconfdir}/rc.d/init.d %global daemondir %{_sysconfdir}/rc.d/init.d
%global daemon_no_prefix mysqld
%endif %endif
# MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use # MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use
@ -91,6 +93,9 @@
%global logfiledir %{_localstatedir}/log/%{daemon_name} %global logfiledir %{_localstatedir}/log/%{daemon_name}
%global logfile %{logfiledir}/%{daemon_name}.log %global logfile %{logfiledir}/%{daemon_name}.log
# Directory for storing pid file
%global pidfiledir %{_localstatedir}/run/%{daemon_name}
# Defining where database data live # Defining where database data live
%global dbdatadir %{_localstatedir}/lib/mysql %global dbdatadir %{_localstatedir}/lib/mysql
@ -568,8 +573,9 @@ export LDFLAGS
-DFEATURE_SET="community" \ -DFEATURE_SET="community" \
-DINSTALL_LAYOUT=RPM \ -DINSTALL_LAYOUT=RPM \
-DDAEMON_NAME="%{daemon_name}" \ -DDAEMON_NAME="%{daemon_name}" \
-DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \
-DLOG_LOCATION="%{logfile}" \ -DLOG_LOCATION="%{logfile}" \
-DPID_FILE_DIR="%{_localstatedir}/run/%{daemon_name}" \ -DPID_FILE_DIR="%{pidfiledir}" \
-DNICE_PROJECT_NAME="MariaDB" \ -DNICE_PROJECT_NAME="MariaDB" \
-DRPM="%{?rhel:rhel%{rhel}}%{!?rhel:fedora%{fedora}}" \ -DRPM="%{?rhel:rhel%{rhel}}%{!?rhel:fedora%{fedora}}" \
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
@ -657,7 +663,7 @@ touch %{buildroot}%{logfile}
# current setting in my.cnf is to use /var/run/mariadb for creating pid file, # current setting in my.cnf is to use /var/run/mariadb for creating pid file,
# however since my.cnf is not updated by RPM if changed, we need to create mysqld # however since my.cnf is not updated by RPM if changed, we need to create mysqld
# as well because users can have odd settings in their /etc/my.cnf # as well because users can have odd settings in their /etc/my.cnf
mkdir -p %{buildroot}%{_localstatedir}/run/%{daemon_name} mkdir -p %{buildroot}%{pidfiledir}
install -p -m 0755 -d %{buildroot}%{dbdatadir} install -p -m 0755 -d %{buildroot}%{dbdatadir}
%if %{with config} %if %{with config}
@ -1082,7 +1088,7 @@ fi
%{_libexecdir}/mysql-scripts-common %{_libexecdir}/mysql-scripts-common
%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf} %{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{daemon_name} %attr(0755,mysql,mysql) %dir %{pidfiledir}
%attr(0755,mysql,mysql) %dir %{dbdatadir} %attr(0755,mysql,mysql) %dir %{dbdatadir}
%attr(0750,mysql,mysql) %dir %{logfiledir} %attr(0750,mysql,mysql) %dir %{logfiledir}
%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile} %attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
@ -1143,6 +1149,8 @@ fi
- Wait for daemon ends - Wait for daemon ends
Resolves: #1072958 Resolves: #1072958
- Do not include symlink to libmysqlclient if not shipping the library - Do not include symlink to libmysqlclient if not shipping the library
- Do not use scl prefix more than once in paths
Based on https://www.redhat.com/archives/sclorg/2015-February/msg00038.html
* Wed Mar 04 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.17-1 * Wed Mar 04 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.17-1
- Rebase to version 10.0.17 - Rebase to version 10.0.17

2
mysql.init.in
View File

@ -36,7 +36,7 @@ MYGROUP=mysql
# Edit the following file in order to re-write some of the environment # Edit the following file in order to re-write some of the environment
# variables defined above, like $STARTTIMEOUT, $STOPTIMEOUT, $exec # variables defined above, like $STARTTIMEOUT, $STOPTIMEOUT, $exec
[ -e @sysconfdir@/sysconfig/$prog ] && . @sysconfdir@/sysconfig/$prog [ -e @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@ ] && . @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@
lockfile=/var/lock/subsys/$prog lockfile=/var/lock/subsys/$prog