Merge from mysql-5.5.33-release
This commit is contained in:
commit
a2fc17278f
@ -664,6 +664,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
|
||||
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
|
||||
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
|
||||
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
|
||||
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
|
||||
echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
@ -980,6 +981,10 @@ fi
|
||||
%{_mandir}/man1/mysql_client_test.1*
|
||||
|
||||
%changelog
|
||||
* Wed Jul 10 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
|
||||
- Removed directory /usr/share/mysql/solaris/postinstall-solaris to resolve build
|
||||
error
|
||||
|
||||
* Thu Dec 7 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
|
||||
- Change the way in which "libmysqld.so" is created: Using all object modules
|
||||
was wrong, gcc / ld can resolve the dependencies from "libmysqld.a".
|
||||
|
@ -81,7 +81,6 @@ if [ -n "$INSTALL" ] ; then
|
||||
cd "$mybasedir"
|
||||
scripts/mysql_install_db \
|
||||
--rpm \
|
||||
--random-passwords \
|
||||
--user=mysql \
|
||||
--basedir="$mybasedir" \
|
||||
--datadir=$mydatadir
|
||||
|
@ -288,6 +288,8 @@ Group: Applications/Databases
|
||||
Requires: %{distro_requires}
|
||||
%if 0%{?commercial}
|
||||
Obsoletes: MySQL-server
|
||||
%else
|
||||
Obsoletes: MySQL-server-advanced
|
||||
%endif
|
||||
Obsoletes: mysql-server mysql-advanced mysql-server-advanced
|
||||
Obsoletes: MySQL-server-classic MySQL-server-community MySQL-server-enterprise
|
||||
@ -323,6 +325,8 @@ Summary: MySQL - Client
|
||||
Group: Applications/Databases
|
||||
%if 0%{?commercial}
|
||||
Obsoletes: MySQL-client
|
||||
%else
|
||||
Obsoletes: MySQL-client-advanced
|
||||
%endif
|
||||
Obsoletes: mysql < %{version}-%{release}
|
||||
Obsoletes: mysql-advanced < %{version}-%{release}
|
||||
@ -341,10 +345,11 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
|
||||
Summary: MySQL - Test suite
|
||||
Group: Applications/Databases
|
||||
%if 0%{?commercial}
|
||||
Obsoletes: MySQL-test
|
||||
Requires: MySQL-client-advanced perl
|
||||
Obsoletes: MySQL-test
|
||||
%else
|
||||
Requires: MySQL-client perl
|
||||
Obsoletes: MySQL-test-advanced
|
||||
%endif
|
||||
Obsoletes: mysql-test mysql-test-advanced
|
||||
Obsoletes: mysql-bench MySQL-bench
|
||||
@ -363,6 +368,8 @@ Summary: MySQL - Development header files and libraries
|
||||
Group: Applications/Databases
|
||||
%if 0%{?commercial}
|
||||
Obsoletes: MySQL-devel
|
||||
%else
|
||||
Obsoletes: MySQL-devel-advanced
|
||||
%endif
|
||||
Obsoletes: mysql-devel mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced
|
||||
Obsoletes: MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise
|
||||
@ -381,6 +388,8 @@ Summary: MySQL - Shared libraries
|
||||
Group: Applications/Databases
|
||||
%if 0%{?commercial}
|
||||
Obsoletes: MySQL-shared
|
||||
%else
|
||||
Obsoletes: MySQL-shared-advanced
|
||||
%endif
|
||||
Obsoletes: MySQL-shared-standard MySQL-shared-pro
|
||||
Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl
|
||||
@ -397,10 +406,11 @@ and applications need to dynamically load and use MySQL.
|
||||
Summary: MySQL - Embedded library
|
||||
Group: Applications/Databases
|
||||
%if 0%{?commercial}
|
||||
Obsoletes: MySQL-embedded
|
||||
Requires: MySQL-devel-advanced
|
||||
Obsoletes: MySQL-embedded
|
||||
%else
|
||||
Requires: MySQL-devel
|
||||
Obsoletes: MySQL-embedded-advanced
|
||||
%endif
|
||||
Obsoletes: mysql-embedded mysql-embedded-advanced
|
||||
Obsoletes: MySQL-embedded-pro
|
||||
|
Loading…
x
Reference in New Issue
Block a user