commit 72fb98c6ba8c4dafc13fd875289aa64f5d73f5b2
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Mar 17 19:57:46 2014 +0100
- up to 5.6.16-64.1; sphinx up to 2.1.6; needs testing due to
mysql->percona-server dir change
mysql.init | 10 +++---
mysql.spec | 103 +++++++++++++++++++++++++++++++------------------------------
2 files changed, 57 insertions(+), 56 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index e604398..97c40d3 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -24,7 +24,7 @@
%bcond_with ndb # NDB is now a separate product, this here is
broken, so disable it
%define rel 1
-%define percona_rel 64.0
+%define percona_rel 64.1
%include /usr/lib/rpm/macros.perl
Summary: MySQL: a very fast and reliable SQL database engine
Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank
@@ -42,9 +42,9 @@ Group: Applications/Databases
# Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
# Source0:
http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
Source0:
http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: b79711dc43f16adedea1a37bf9eece3d
-Source100: http://www.sphinxsearch.com/files/sphinx-2.1.4-release.tar.gz
-# Source100-md5: 3d453b507834ec746237e2016d34f928
+# Source0-md5: ba75fbcc530dc74ebb978cf450c011b3
+Source100: http://www.sphinxsearch.com/files/sphinx-2.1.6-release.tar.gz
+# Source100-md5: f416c743c0e0f4e337b4549928d8494f
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
@@ -124,6 +124,7 @@ Obsoletes: mysql-server
Conflicts: logrotate < 3.8.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _orgname percona-server
%define _libexecdir %{_sbindir}
%define _localstatedir /var/lib/mysql
%define _mysqlhome /home/services/mysql
@@ -555,7 +556,7 @@ cd build
-DINSTALL_MYSQLTESTDIR_RPM="" \
-DINSTALL_PLUGINDIR=%{_libdir}/%{name}/plugin \
-DINSTALL_SQLBENCHDIR=%{_datadir} \
- -DINSTALL_SUPPORTFILESDIR=%{_datadir}/%{name}-support \
+ -DINSTALL_SUPPORTFILESDIR=%{_datadir}/%{_orgname}-support \
-DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \
%{?debug:-DWITH_DEBUG=ON} \
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
@@ -606,7 +607,7 @@ touch
$RPM_BUILD_ROOT/var/log/%{name}/{mysqld,query,slow}.log
cp mysqld.conf mysqld.tmp
awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp >
mysqld.conf
-cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.conf
+cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.conf
cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/mysql-client.conf
ln -s mysql-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/my.cnf
cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/skel/.my.cnf
@@ -626,7 +627,7 @@ sed -i -e '/libs/s/$ldflags//'
$RPM_BUILD_ROOT%{_bindir}/mysql_config
sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
# remove known unpackaged files
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mysql-support
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{_orgname}-support
# rename not to be so generic name
mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump
@@ -639,9 +640,9 @@ mv
$RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}/mysqlaccess.conf
%{!?debug:%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_resolve_stack_dump}
%{!?debug:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_resolve_stack_dump.1}
# generate symbols file, so one can generate backtrace using it
-# mysql_resolve_stack_dump -s %{_datadir}/%{name}/mysqld.sym -n mysqld.stack.
+# mysql_resolve_stack_dump -s %{_datadir}/%{_orgname}/mysqld.sym -n
mysqld.stack.
# http://dev.mysql.com/doc/refman/5.0/en/using-stack-trace.html
-%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld >
$RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.sym}
+%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld >
$RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.sym}
# do not clobber users $PATH
mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_plugin
@@ -660,10 +661,10 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_safe
%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysqld_multi
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}*
-#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate
-#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server
-#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg-utf8.txt
+#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysql-log-rotate
+#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysql.server
+#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/binary-configure
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/errmsg-utf8.txt
%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1*
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server*
@@ -795,7 +796,7 @@ done
%banner -e %{name}-4.1.x <<-EOF
If you want to use new help tables in MySQL 4.1.x then You'll need to
import the help data:
- mysql -u mysql mysql < %{_datadir}/%{name}/fill_help_tables.sql
+ mysql -u mysql mysql < %{_datadir}/%{_orgname}/fill_help_tables.sql
EOF
#'
@@ -935,7 +936,7 @@ done
%if %{?debug:1}0
%attr(755,root,root) %{_bindir}/*resolve_stack_dump
-%{_datadir}/%{name}/mysqld.sym
+%{_datadir}/%{_orgname}/mysqld.sym
%{_mandir}/man1/*resolve_stack_dump.1*
%endif
@@ -947,45 +948,45 @@ done
%attr(640,mysql,mysql) %ghost /var/log/mysql/*
# This is template for configuration file which is created after 'service
mysql init'
-%{_datadir}/%{name}/mysqld.conf
-%{_datadir}/%{name}/mysql_security_commands.sql
-%{_datadir}/%{name}/mysql_system_tables_data.sql
-%{_datadir}/%{name}/mysql_system_tables.sql
-%{_datadir}/%{name}/mysql_test_data_timezone.sql
-
-%{_datadir}/%{name}/english
-%{_datadir}/%{name}/dictionary.txt
-%{_datadir}/%{name}/fill_help_tables.sql
-%{_datadir}/%{name}/innodb_memcached_config.sql
-#%{_datadir}/%{name}/mysql_fix_privilege_tables.sql
-%lang(bg) %{_datadir}/%{name}/bulgarian
-%lang(cs) %{_datadir}/%{name}/czech
-%lang(da) %{_datadir}/%{name}/danish
-%lang(de) %{_datadir}/%{name}/german
-%lang(el) %{_datadir}/%{name}/greek
-%lang(es) %{_datadir}/%{name}/spanish
-%lang(et) %{_datadir}/%{name}/estonian
-%lang(fr) %{_datadir}/%{name}/french
-%lang(hu) %{_datadir}/%{name}/hungarian
-%lang(it) %{_datadir}/%{name}/italian
-%lang(ja) %{_datadir}/%{name}/japanese
-%lang(ko) %{_datadir}/%{name}/korean
-%lang(nl) %{_datadir}/%{name}/dutch
-%lang(nb) %{_datadir}/%{name}/norwegian
-%lang(nn) %{_datadir}/%{name}/norwegian-ny
-%lang(pl) %{_datadir}/%{name}/polish
-%lang(pt) %{_datadir}/%{name}/portuguese
-%lang(ro) %{_datadir}/%{name}/romanian
-%lang(ru) %{_datadir}/%{name}/russian
-%lang(sr) %{_datadir}/%{name}/serbian
-%lang(sk) %{_datadir}/%{name}/slovak
-%lang(sv) %{_datadir}/%{name}/swedish
-%lang(uk) %{_datadir}/%{name}/ukrainian
+%{_datadir}/%{_orgname}/mysqld.conf
+%{_datadir}/%{_orgname}/mysql_security_commands.sql
+%{_datadir}/%{_orgname}/mysql_system_tables_data.sql
+%{_datadir}/%{_orgname}/mysql_system_tables.sql
+%{_datadir}/%{_orgname}/mysql_test_data_timezone.sql
+
+%{_datadir}/%{_orgname}/english
+%{_datadir}/%{_orgname}/dictionary.txt
+%{_datadir}/%{_orgname}/fill_help_tables.sql
+%{_datadir}/%{_orgname}/innodb_memcached_config.sql
+#%{_datadir}/%{_orgname}/mysql_fix_privilege_tables.sql
+%lang(bg) %{_datadir}/%{_orgname}/bulgarian
+%lang(cs) %{_datadir}/%{_orgname}/czech
+%lang(da) %{_datadir}/%{_orgname}/danish
+%lang(de) %{_datadir}/%{_orgname}/german
+%lang(el) %{_datadir}/%{_orgname}/greek
+%lang(es) %{_datadir}/%{_orgname}/spanish
+%lang(et) %{_datadir}/%{_orgname}/estonian
+%lang(fr) %{_datadir}/%{_orgname}/french
+%lang(hu) %{_datadir}/%{_orgname}/hungarian
+%lang(it) %{_datadir}/%{_orgname}/italian
+%lang(ja) %{_datadir}/%{_orgname}/japanese
+%lang(ko) %{_datadir}/%{_orgname}/korean
+%lang(nl) %{_datadir}/%{_orgname}/dutch
+%lang(nb) %{_datadir}/%{_orgname}/norwegian
+%lang(nn) %{_datadir}/%{_orgname}/norwegian-ny
+%lang(pl) %{_datadir}/%{_orgname}/polish
+%lang(pt) %{_datadir}/%{_orgname}/portuguese
+%lang(ro) %{_datadir}/%{_orgname}/romanian
+%lang(ru) %{_datadir}/%{_orgname}/russian
+%lang(sr) %{_datadir}/%{_orgname}/serbian
+%lang(sk) %{_datadir}/%{_orgname}/slovak
+%lang(sv) %{_datadir}/%{_orgname}/swedish
+%lang(uk) %{_datadir}/%{_orgname}/ukrainian
%files charsets
%defattr(644,root,root,755)
-%dir %{_datadir}/mysql
-%{_datadir}/%{name}/charsets
+%dir %{_datadir}/%{_orgname}
+%{_datadir}/%{_orgname}/charsets
%files extras
%defattr(644,root,root,755)
diff --git a/mysql.init b/mysql.init
index fb8bd1b..47db1a1 100755
--- a/mysql.init
+++ b/mysql.init
@@ -468,13 +468,13 @@ mysqlinit() {
chown mysql:mysql "$MYSQL_CLUSTER_DIR/mysqldb" "$MYSQL_DATA_DIR" >
/dev/null 2>&1
chmod 751 "$MYSQL_CLUSTER_DIR" "$MYSQL_CLUSTER_DIR/mysqldb"
- if [ -f /usr/share/mysql/mysqld.conf -a ! -f
"$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
+ if [ -f /usr/share/percona-server/mysqld.conf -a ! -f
"$MYSQL_CLUSTER_DIR/mysqld.conf" ]; then
sed -e "
s#\(datadir.*\)=.*#\1= $MYSQL_DATA_DIR#g;
s#\(pid-file.*\)=.*#\1= $MYSQL_PIDFILE#g;
s#\(socket.*\)=.*#\1= $MYSQL_SOCKET#g;
s#@clusterdir@#$MYSQL_CLUSTER_DIR#g;
- " /usr/share/mysql/mysqld.conf >
"$MYSQL_CLUSTER_DIR/mysqld.conf"
+ " /usr/share/percona-server/mysqld.conf >
"$MYSQL_CLUSTER_DIR/mysqld.conf"
chown root:root "$MYSQL_CLUSTER_DIR/mysqld.conf"
chmod 640 "$MYSQL_CLUSTER_DIR/mysqld.conf"
fi
@@ -487,8 +487,8 @@ mysqlinit() {
cat > $MYSQL_DATA_DIR/mysql-init.sql <<-EOF
CREATE DATABASE mysql;
use mysql;
- $(cat /usr/share/mysql/mysql_system_tables.sql)
- $(sed -e "/@current_hostname/d"
/usr/share/mysql/mysql_system_tables_data.sql)
+ $(cat /usr/share/percona-server/mysql_system_tables.sql)
+ $(sed -e "/@current_hostname/d"
/usr/share/percona-server/mysql_system_tables_data.sql)
EOF
ok=0
@@ -526,7 +526,7 @@ mysqladmin section. See the manual for more instructions.
END_OF_MSG
show "Filling help tables..."
ok=0
- ( echo "use mysql;"; cat /usr/share/mysql/fill_help_tables.sql
) | \
+ ( echo "use mysql;"; cat
/usr/share/percona-server/fill_help_tables.sql ) | \
/usr/sbin/mysqld \
--defaults-file=$MYSQL_CLUSTER_DIR/mysqld.conf \
--bootstrap \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/72fb98c6ba8c4dafc13fd875289aa64f5d73f5b2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
