[mariadb/el5: 6/6] Merge couple of changes from Fedora Rawhide
Honza Horak
hhorak at fedoraproject.org
Tue Nov 19 12:56:52 UTC 2013
commit 1b9d2a8844f6677d3fbf9a3ef3d78977235a2ea2
Merge: 8188469 e7892da
Author: Honza Horák <hhorak at redhat.com>
Date: Tue Nov 19 13:47:52 2013 +0100
Merge couple of changes from Fedora Rawhide
libmysql.version | 95 +++++++++++++++++
mariadb-install-test.patch | 20 ++--
mariadb.spec | 252 +++++++++++++++++++++++++++++++++++---------
my_config.h | 4 +
4 files changed, 311 insertions(+), 60 deletions(-)
---
diff --cc mariadb.spec
index 73f85c1,9cb56c0..568e37b
--- a/mariadb.spec
+++ b/mariadb.spec
@@@ -49,11 -52,15 +52,16 @@@ Patch17: mariadb-covscan-signexpr.patc
Patch18: mariadb-covscan-stroverflow.patch
Patch20: mariadb-cmakehostname.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
+ %if 0%{?rhel}>=6 || 0%{?fedora}
+ BuildRequires: systemtap-sdt-devel
+ %endif
# make test requires time and ps
BuildRequires: time procps
+ # auth_pam.so plugin will be build if pam-devel is installed
+ BuildRequires: pam-devel
# perl modules needed to run regression tests
BuildRequires: perl(Socket), perl(Time::HiRes)
BuildRequires: perl(Data::Dumper), perl(Test::More), perl(Env)
@@@ -291,9 -300,15 +301,16 @@@ export LDFLAG
cmake . -DBUILD_CONFIG=mysql_release \
-DFEATURE_SET="community" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DINSTALL_LAYOUT=RPM \
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+ %if 0%{?fedora} >= 20
+ -DINSTALL_DOCDIR=share/doc/mariadb \
+ -DINSTALL_DOCREADMEDIR=share/doc/mariadb \
+ %else
+ -DINSTALL_DOCDIR=share/doc/%{name}-%{version} \
+ -DINSTALL_DOCREADMEDIR=share/doc/%{name}-%{version} \
+ %endif
-DINSTALL_INCLUDEDIR=include/mysql \
-DINSTALL_INFODIR=share/info \
-DINSTALL_LIBDIR="%{_lib}/mysql" \
@@@ -472,17 -497,13 +501,16 @@@ rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/l
# remove solaris files
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/
++%clean
++rm -rf $RPM_BUILD_ROOT
++
+ %post
+ %{_sbindir}/update-alternatives --install %{_bindir}/mysql_config \
+ mysql_config %{_libdir}/mysql/mysql_config %{__isa_bits}
+
%pre server
/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
- /usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
+ /usr/sbin/useradd -M -N -g mysql -o -r -d %{_localstatedir}/lib/mysql -s /bin/bash \
-c "MariaDB Server" -u 27 mysql >/dev/null 2>&1 || :
%post libs -p /sbin/ldconfig
@@@ -688,9 -715,8 +725,9 @@@ f
%config(noreplace) %{_sysconfdir}/logrotate.d/mysqld
%files devel
+%defattr(-,root,root)
- /usr/include/mysql
- /usr/share/aclocal/mysql.m4
+ %{_includedir}/mysql
+ %{_datadir}/aclocal/mysql.m4
%{_libdir}/mysql/libmysqlclient.so
%{_libdir}/mysql/libmysqlclient_r.so
@@@ -721,27 -743,145 +758,138 @@@
%{_mandir}/man1/mysql_client_test.1*
%changelog
- * Thu Oct 10 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-1
- - Rebase to 5.5.33a
- https://kb.askmonty.org/en/mariadb-5533-changelog/
- https://kb.askmonty.org/en/mariadb-5533a-changelog/
- - Enable outfile_loaddata test
- - Disable tokudb_innodb_xa_crash test
-
- * Tue Aug 20 2013 Honza Horak <hhorak at redhat.com> 5.5.32-1
+ * Tue Nov 19 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-5
+ - Merge couple of changes from Fedora Rawhide
+
+ * Mon Nov 4 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-4
+ - Fix spec file to be ready for backport by Oden Eriksson
+ Resolves: #1026404
+
+ * Mon Nov 4 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-3
+ - Add pam-devel to build-requires in order to build
+ Related: #1019945
+ - Check if correct process is running in mysql-wait-ready script
+ Related: #1026313
+
+ * Mon Oct 14 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-2
+ - Turn on test suite
+
-* Thu Oct 10 2013 Honza Horak <hhorak at redhat.com> 1:5.5.33a-1
-- Rebase to 5.5.33a
- https://kb.askmonty.org/en/mariadb-5533-changelog/
- https://kb.askmonty.org/en/mariadb-5533a-changelog/
-- Enable outfile_loaddata test
-- Disable tokudb_innodb_xa_crash test
-
+ * Mon Sep 2 2013 Honza Horak <hhorak at redhat.com> - 1:5.5.32-12
+ - Re-organize my.cnf to include only generic settings
+ Resolves: #1003115
+ - Move pid file location to /var/run/mariadb
+ - Make mysqld a symlink to mariadb unit file rather than the opposite way
+ Related: #999589
+
+ * Thu Aug 29 2013 Honza Horak <hhorak at redhat.com> - 1:5.5.32-11
+ - Move log file into /var/log/mariadb/mariadb.log
+ - Rename logrotate script to mariadb
+ - Resolves: #999589
+
+ * Wed Aug 14 2013 Rex Dieter <rdieter at fedoraproject.org> 1:5.5.32-10
+ - fix alternatives usage
+
+ * Tue Aug 13 2013 Honza Horak <hhorak at redhat.com> - 1:5.5.32-9
+ - Multilib issues solved by alternatives
+ Resolves: #986959
+
+ * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 1:5.5.32-8
+ - Perl 5.18 rebuild
+
+ * Wed Jul 31 2013 Honza Horak <hhorak at redhat.com> - 1:5.5.32-7
+ - Do not use login shell for mysql user
+
+ * Tue Jul 30 2013 Honza Horak <hhorak at redhat.com> - 1:5.5.32-6
+ - Remove unneeded systemd-sysv requires
+ - Provide mysql-compat-server symbol
+ - Create mariadb.service symlink
+ - Fix multilib header location for arm
+ - Enhance documentation in the unit file
+ - Use scriptstub instead of links to avoid multilib conflicts
+ - Add condition for doc placement in F20+
+
+ * Sun Jul 28 2013 Dennis Gilmore <dennis at ausil.us> - 1:5.5.32-5
+ - remove "Requires(pretrans): systemd" since its not possible
+ - when installing mariadb and systemd at the same time. as in a new install
+
+ * Sat Jul 27 2013 Kevin Fenzi <kevin at scrye.com> 1:5.5.32-4
+ - Set rpm doc macro to install docs in unversioned dir
+
+ * Fri Jul 26 2013 Dennis Gilmore <dennis at ausil.us> 1:5.5.32-3
+ - add Requires(pre) on systemd for the server package
+
+ * Tue Jul 23 2013 Dennis Gilmore <dennis at ausil.us> 1:5.5.32-2
+ - replace systemd-units requires with systemd
+ - remove solaris files
+
+ * Fri Jul 19 2013 Honza Horak <hhorak at redhat.com> 1:5.5.32-1
- Rebase to 5.5.32
https://kb.askmonty.org/en/mariadb-5532-changelog/
+ - Clean-up un-necessary systemd snippets
+
+ * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1:5.5.31-7
+ - Perl 5.18 rebuild
+
+ * Mon Jul 1 2013 Honza Horak <hhorak at redhat.com> 1:5.5.31-6
+ - Test suite params enhanced to decrease server condition influence
+ - Fix misleading error message when uninstalling built-in plugins
+ Related: #966873
+
+ * Thu Jun 27 2013 Honza Horak <hhorak at redhat.com> 1:5.5.31-5
+ - Apply fixes found by Coverity static analysis tool
+
+ * Wed Jun 19 2013 Honza Horak <hhorak at redhat.com> 1:5.5.31-4
+ - Do not use pretrans scriptlet, which doesn't work in anaconda
+ Resolves: #975348
+
+ * Fri Jun 14 2013 Honza Horak <hhorak at redhat.com> 1:5.5.31-3
+ - Explicitly enable mysqld if it was enabled in the beggining
+ of the transaction.
+
+ * Thu Jun 13 2013 Honza Horak <hhorak at redhat.com> 1:5.5.31-2
+ - Apply man page fix from Jan Stanek
- * Mon Jun 3 2013 Honza Horak <hhorak at redhat.com> 5.5.31-1
+ * Fri May 24 2013 Honza Horak <hhorak at redhat.com> 1:5.5.31-1
- Rebase to 5.5.31
https://kb.askmonty.org/en/mariadb-5531-changelog/
+ - Preserve time-stamps in case of installed files
+ - Use /var/tmp instead of /tmp, since the later is using tmpfs,
+ which can cause problems
+ Resolves: #962087
+ - Fix test suite requirements
- * Wed Feb 27 2013 Honza Horak <hhorak at redhat.com> 5.5.29-7
- - Remove BuildRequires on systemtap-sdt-devel
- - Using RHEL-5 specific macros
+ * Sun May 5 2013 Honza Horak <hhorak at redhat.com> 1:5.5.30-2
+ - Remove mytop utility, which is packaged separately
+ - Resolve multilib conflicts in mysql/private/config.h
- * Wed Feb 20 2013 Honza Horak <hhorak at redhat.com> 5.5.29-6
- - Remove systemd unit file and use init script instead
+ * Fri Mar 22 2013 Honza Horak <hhorak at redhat.com> 1:5.5.30-1
+ - Rebase to 5.5.30
+ https://kb.askmonty.org/en/mariadb-5530-changelog/
+
+ * Fri Mar 22 2013 Honza Horak <hhorak at redhat.com> 1:5.5.29-11
+ - Obsolete MySQL since it is now renamed to community-mysql
+ - Remove real- virtual names
+
+ * Thu Mar 21 2013 Honza Horak <hhorak at redhat.com> 1:5.5.29-10
+ - Adding epoch to have higher priority than other mysql implementations
+ when comes to provider comparison
+
+ * Wed Mar 13 2013 Honza Horak <hhorak at redhat.com> 5.5.29-9
+ - Let mariadb-embedded-devel conflict with MySQL-embedded-devel
+ - Adjust mariadb-sortbuffer.patch to correspond with upstream patch
+
+ * Mon Mar 4 2013 Honza Horak <hhorak at redhat.com> 5.5.29-8
+ - Mask expected warnings about setrlimit in test suite
+
+ * Thu Feb 28 2013 Honza Horak <hhorak at redhat.com> 5.5.29-7
+ - Use configured prefix value instead of guessing basedir
+ in mysql_config
+ Resolves: #916189
+ - Export dynamic columns and non-blocking API functions documented
+ by upstream
+
+ * Wed Feb 27 2013 Honza Horak <hhorak at redhat.com> 5.5.29-6
+ - Fix sort_buffer_length option type
* Wed Feb 13 2013 Honza Horak <hhorak at redhat.com> 5.5.29-5
- Suppress warnings in tests and skip tests also on ppc64p7
More information about the scm-commits
mailing list