Manual merge from mysql-trunk.
Conflicts: - support-files/mysql.spec.sh
This commit is contained in:
commit
0835775b7c
@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
|
||||
#
|
||||
# When changing major version number please also check switch statement
|
||||
# in client/mysqlbinlog.cc:check_master_version().
|
||||
AM_INIT_AUTOMAKE(mysql, 5.5.1-m2)
|
||||
AM_INIT_AUTOMAKE(mysql, 5.5.2-m2)
|
||||
AM_CONFIG_HEADER([include/config.h:config.h.in])
|
||||
|
||||
# Request support for automake silent-rules if available.
|
||||
|
@ -1,3 +1,4 @@
|
||||
# Copyright 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
|
||||
#
|
||||
# MySQL-shared-compat.spec
|
||||
#
|
||||
@ -7,8 +8,6 @@
|
||||
# separate "MySQL-shared" package. This spec file simply repackages two
|
||||
# already existing MySQL-shared RPMs into a single package.
|
||||
#
|
||||
# Copyright (C) 2003 MySQL AB
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by the Free
|
||||
# Software Foundation; version 2 of the License.
|
||||
@ -28,27 +27,27 @@
|
||||
#
|
||||
# Change this to match the version of the shared libs you want to include
|
||||
#
|
||||
%define version50 @MYSQL_NO_DASH_VERSION@
|
||||
%define version_cur @MYSQL_U_SCORE_VERSION@
|
||||
%define version41 4.1.17
|
||||
%define version40 4.0.26
|
||||
%define version3 3.23.58
|
||||
|
||||
Name: MySQL-shared-compat
|
||||
Packager: MySQL Product Engineering team <build@mysql.com>
|
||||
Vendor: MySQL AB
|
||||
Packager: Sun Microsystems, Inc. Product Engineering Team <build@mysql.com>
|
||||
Vendor: Sun Microsystems, Inc.
|
||||
License: GPL
|
||||
Group: Applications/Databases
|
||||
URL: http://www.mysql.com/
|
||||
Autoreqprov: on
|
||||
Version: %{version50}
|
||||
Release: 0
|
||||
Version: %{version_cur}
|
||||
Release: 1
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Obsoletes: MySQL-shared, mysql-shared
|
||||
Provides: MySQL-shared
|
||||
Summary: MySQL shared client libraries for MySQL %{version}, %{version41}, %{version40} and %{version3}
|
||||
# We simply use the "MySQL-shared" subpackages as input sources instead of
|
||||
# rebuilding all from source
|
||||
Source0: MySQL-shared-%{version50}-0.%{_arch}.rpm
|
||||
Source0: MySQL-shared-%{version_cur}-1.%{_arch}.rpm
|
||||
Source1: MySQL-shared-%{version41}-1.%{_arch}.rpm
|
||||
Source2: MySQL-shared-%{version40}-0.%{_arch}.rpm
|
||||
Source3: MySQL-shared-%{version3}-1.%{_arch}.rpm
|
||||
@ -62,7 +61,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
This package includes the shared libraries for MySQL %{version3},
|
||||
MySQL %{version40}, %{version41} as well as MySQL %{version50}.
|
||||
MySQL %{version40}, %{version41} as well as MySQL %{version_cur}.
|
||||
Install this package instead of "MySQL-shared", if you have applications
|
||||
installed that are dynamically linked against older versions of the MySQL
|
||||
client library but you want to upgrade to MySQL %{version} without breaking the
|
||||
@ -84,3 +83,14 @@ rpm2cpio %{SOURCE3} | cpio -iv --make-directories
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libmysqlclient*
|
||||
|
||||
# The spec file changelog only includes changes made to the spec file
|
||||
# itself - note that they must be ordered by date (important when
|
||||
# merging BK trees)
|
||||
%changelog
|
||||
* Tue Dec 22 2009 Joerg Bruehe <joerg.bruehe@sun.com>
|
||||
|
||||
- Change RPM file naming:
|
||||
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
|
||||
- Release counts from 1, not 0.
|
||||
|
||||
|
@ -686,7 +686,7 @@ fi
|
||||
%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
|
||||
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
|
||||
%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
|
||||
%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
|
||||
#%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_privilege_tables.1*
|
||||
%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
|
||||
%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
|
||||
%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
|
||||
@ -728,8 +728,8 @@ fi
|
||||
%attr(755, root, root) %{_bindir}/resolveip
|
||||
|
||||
%attr(755, root, root) %{_libdir}/mysql/plugin/ha_example.so*
|
||||
%attr(755, root, root) %{_libdir}/mysql/plugin/libsemisync_master.so*
|
||||
%attr(755, root, root) %{_libdir}/mysql/plugin/libsemisync_slave.so*
|
||||
%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so*
|
||||
%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so*
|
||||
|
||||
%if %{WITH_TCMALLOC}
|
||||
%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}
|
||||
@ -862,10 +862,10 @@ fi
|
||||
%{_libdir}/mysql/libz.la
|
||||
%{_libdir}/mysql/plugin/ha_example.a
|
||||
%{_libdir}/mysql/plugin/ha_example.la
|
||||
%{_libdir}/mysql/plugin/libsemisync_master.a
|
||||
%{_libdir}/mysql/plugin/libsemisync_master.la
|
||||
%{_libdir}/mysql/plugin/libsemisync_slave.a
|
||||
%{_libdir}/mysql/plugin/libsemisync_slave.la
|
||||
%{_libdir}/mysql/plugin/semisync_master.a
|
||||
%{_libdir}/mysql/plugin/semisync_master.la
|
||||
%{_libdir}/mysql/plugin/semisync_slave.a
|
||||
%{_libdir}/mysql/plugin/semisync_slave.la
|
||||
|
||||
%files shared
|
||||
%defattr(-, root, root, 0755)
|
||||
@ -901,6 +901,14 @@ fi
|
||||
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
|
||||
- Release counts from 1, not 0.
|
||||
|
||||
* Wed Dec 23 2009 Joerg Bruehe <joerg.bruehe@sun.com>
|
||||
|
||||
- The "semisync" plugin file name has lost its introductory "lib",
|
||||
adapt the file lists for the subpackages.
|
||||
This is a part missing from the fix for bug#48351.
|
||||
- Remove the "fix_privilege_tables" manual, it does not exist in 5.5
|
||||
(and likely, the whole script will go, too).
|
||||
|
||||
* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
|
||||
|
||||
- Fix some problems with the directives around "tcmalloc" (experimental),
|
||||
|
Loading…
x
Reference in New Issue
Block a user