[mariadb/el6] Rebase to 5.5.31
Honza Horak
hhorak at fedoraproject.org
Mon Jun 3 13:24:27 UTC 2013
commit 9a6d2dc2adf5dc05c83d8a1b99275fe7289e040c
Author: Honza Horák <hhorak at redhat.com>
Date: Mon Jun 3 15:24:09 2013 +0200
Rebase to 5.5.31
mariadb-basedir.patch | 15 +++++++++
mariadb-buffer.patch | 24 --------------
mariadb.spec | 82 +++++++++++++-----------------------------------
3 files changed, 37 insertions(+), 84 deletions(-)
---
diff --git a/mariadb-basedir.patch b/mariadb-basedir.patch
new file mode 100644
index 0000000..f5a5ebf
--- /dev/null
+++ b/mariadb-basedir.patch
@@ -0,0 +1,15 @@
+Don't guess basedir in mysql_config; we place it under _libdir because
+of multilib conflicts, so use rather configured @prefix@ path directly.
+
+diff -up mariadb-5.5.29/scripts/mysql_config.sh.basedir mariadb-5.5.29/scripts/mysql_config.sh
+--- mariadb-5.5.29/scripts/mysql_config.sh.basedir 2013-02-28 09:39:26.628440114 +0100
++++ mariadb-5.5.29/scripts/mysql_config.sh 2013-02-28 09:39:40.613439729 +0100
+@@ -76,7 +76,7 @@ get_full_path ()
+
+ me=`get_full_path $0`
+
+-basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
++basedir='@prefix@'
+
+ ldata='@localstatedir@'
+ execdir='@libexecdir@'
diff --git a/mariadb.spec b/mariadb.spec
index 2b3a557..3fe5fb1 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1,6 +1,6 @@
Name: mariadb
-Version: 5.5.29
-Release: 6%{?dist}
+Version: 5.5.31
+Release: 1%{?dist}
Summary: A community developed branch of MySQL
Group: Applications/Databases
@@ -11,12 +11,6 @@ URL: http://mariadb.org
# Some code related to test-suite is under LGPLv2
License: GPLv2 with exceptions and LGPLv2 and BSD
-# The evr of mysql we want to obsolete
-%global obsoleted_mysql_evr 5.6-0
-
-# Should mariadb obsolete mysql?
-%{!?obsoletemysql:%global obsoletemysql 0}
-
# Regression tests take a long time, you can skip 'em with this
%{!?runselftest:%global runselftest 1}
@@ -49,7 +43,7 @@ Patch10: mariadb-file-contents.patch
Patch11: mariadb-string-overflow.patch
Patch12: mariadb-dh1024.patch
Patch13: mariadb-man-plugin.patch
-Patch14: mariadb-buffer.patch
+Patch14: mariadb-basedir.patch
BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -58,7 +52,7 @@ BuildRequires: systemtap-sdt-devel
BuildRequires: time procps
# perl modules needed to run regression tests
BuildRequires: perl(Socket), perl(Time::HiRes)
-BuildRequires: perl(Data::Dumper), perl(Test::More)
+BuildRequires: perl(Data::Dumper), perl(Test::More), perl(Env)
Requires: real-%{name}-libs%{?_isa} = %{version}-%{release}
Requires: grep, fileutils, bash
@@ -70,11 +64,7 @@ Provides: mysql = %{version}-%{release}
Provides: mysql%{?_isa} = %{version}-%{release}
Provides: real-%{name} = %{version}-%{release}
Provides: real-%{name}%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql
-%endif
# mysql-cluster used to be built from this SRPM, but no more
Obsoletes: mysql-cluster < 5.1.44
@@ -102,11 +92,7 @@ Provides: mysql-libs = %{version}-%{release}
Provides: mysql-libs%{?_isa} = %{version}-%{release}
Provides: real-%{name}-libs = %{version}-%{release}
Provides: real-%{name}-libs%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-libs < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql-libs
-%endif
%description libs
The mariadb-libs package provides the essential shared libraries for any
@@ -129,11 +115,7 @@ Provides: mysql-server = %{version}-%{release}
Provides: mysql-server%{?_isa} = %{version}-%{release}
Provides: real-%{name}-server = %{version}-%{release}
Provides: real-%{name}-server%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-server < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql-server
-%endif
%description server
MariaDB is a multi-user, multi-threaded SQL database server. It is a
@@ -154,11 +136,7 @@ Provides: mysql-devel = %{version}-%{release}
Provides: mysql-devel%{?_isa} = %{version}-%{release}
Provides: real-%{name}-devel = %{version}-%{release}
Provides: real-%{name}-devel%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-devel < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql-devel
-%endif
%description devel
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -175,11 +153,7 @@ Provides: mysql-embedded = %{version}-%{release}
Provides: mysql-embedded%{?_isa} = %{version}-%{release}
Provides: real-%{name}-embedded = %{version}-%{release}
Provides: real-%{name}-embedded%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql-embedded
-%endif
%description embedded
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -197,11 +171,7 @@ Provides: mysql-embedded-devel = %{version}-%{release}
Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
Provides: real-%{name}-embedded-devel = %{version}-%{release}
Provides: real-%{name}-embedded-devel%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql-embedded-devel
-%endif
%description embedded-devel
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -219,11 +189,7 @@ Provides: mysql-bench = %{version}-%{release}
Provides: mysql-bench%{?_isa} = %{version}-%{release}
Provides: real-%{name}-bench = %{version}-%{release}
Provides: real-%{name}-bench%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-bench < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql-bench
-%endif
%description bench
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -243,11 +209,7 @@ Provides: mysql-test = %{version}-%{release}
Provides: mysql-test%{?_isa} = %{version}-%{release}
Provides: real-%{name}-test = %{version}-%{release}
Provides: real-%{name}-test%{?_isa} = %{version}-%{release}
-%if 0%obsoletemysql
-Obsoletes: mysql-test < %{obsoleted_mysql_evr}
-%else
Conflicts: real-mysql-test
-%endif
%description test
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -277,7 +239,7 @@ MariaDB is a community developed branch of MySQL.
rm -f mysql-test/t/ssl_8k_key-master.opt
# upstream has fallen down badly on symbol versioning, do it ourselves
-cp %{SOURCE8} libmysql/libmysql.version
+cp -p %{SOURCE8} libmysql/libmysql.version
# generate a list of tests that fail, but are not disabled by upstream
cat %{SOURCE14} > mysql-test/rh-skipped-tests.list
@@ -289,12 +251,9 @@ cat %{SOURCE15} >> mysql-test/rh-skipped-tests.list
%ifarch ppc ppc64 ppc64p7 s390 s390x
echo "main.gis-precise : rhbz#906367" >> mysql-test/rh-skipped-tests.list
%endif
-%ifarch ppc s390
-echo "main.myisampack : rhbz#906367" >> mysql-test/rh-skipped-tests.list
-%endif
# install mysql_plugin
-cp %{SOURCE16} man/
+cp -p %{SOURCE16} man/
%build
@@ -357,7 +316,7 @@ make %{?_smp_mflags} VERBOSE=1
# is expected by scripts
for e in innobase xtradb ; do
for f in pars0grm.c pars0grm.y pars0lex.l lexyy.c ; do
- cp "storage/$e/pars/$f" "storage/$e/$f"
+ cp -p "storage/$e/pars/$f" "storage/$e/$f"
done
done
@@ -389,9 +348,6 @@ done
cd mysql-test
perl ./mysql-test-run.pl --force --retry=0 --ssl \
--skip-test-list=rh-skipped-tests.list \
-%ifarch ppc ppc64 ppc64p7
- --nowarnings \
-%endif
--suite-timeout=720 --testcase-timeout=30
# cmake build scripts will install the var cruft if left alone :-(
rm -rf var
@@ -408,8 +364,10 @@ find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES
# we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in
i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 )
- mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
- install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
+ mv $RPM_BUILD_ROOT%{_includedir}/mysql/my_config.h $RPM_BUILD_ROOT%{_includedir}/mysql/my_config_`uname -i`.h
+ mv $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h $RPM_BUILD_ROOT%{_includedir}/mysql/private/my_config_`u
+ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/
+ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/private/config.h
;;
*)
;;
@@ -421,13 +379,13 @@ esac
# libmysqlclient_r anymore either.
sed -e 's/-lprobes_mysql//' -e 's/-lmysqlclient_r/-lmysqlclient/' \
${RPM_BUILD_ROOT}%{_bindir}/mysql_config >mysql_config.tmp
-cp -f mysql_config.tmp ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
+cp -p -f mysql_config.tmp ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
# but that's pretty wacko --- see also mariadb-file-contents.patch)
-install -m 644 Docs/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
-install -m 644 Docs/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
+mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
mkdir -p $RPM_BUILD_ROOT/var/log
touch $RPM_BUILD_ROOT/var/log/mysqld.log
@@ -436,11 +394,11 @@ mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/my.cnf
+install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/my.cnf
# install init script for handling server startup
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/mysqld
+install -p -m 755 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/mysqld
# Fix funny permissions that cmake build scripts apply to config files
chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/mysql/config.*.ini
@@ -487,8 +445,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
# copy additional docs into build tree so %%doc will find them
-cp %{SOURCE6} README.mysql-docs
-cp %{SOURCE7} README.mysql-license
+cp -p %{SOURCE6} README.mysql-docs
+cp -p %{SOURCE7} README.mysql-license
# install the list of skipped tests to be available for user runs
install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test
@@ -733,6 +691,10 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Mon Jun 3 2013 Honza Horak <hhorak at redhat.com> 5.5.31-1
+- Rebase to 5.5.31
+ https://kb.askmonty.org/en/mariadb-5531-changelog/
+
* Wed Feb 20 2013 Honza Horak <hhorak at redhat.com> 5.5.29-6
- Remove systemd unit file and use init script instead
More information about the scm-commits
mailing list