From 8310cf8b32d4fb469a2813ec362f80ad1a232041 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Tue, 9 Jul 2013 20:35:26 +0200 Subject: [PATCH 1/3] Removed directory /usr/share/mysql/solaris/postinstall-solaris to resolve build error --- packaging/rpm-uln/mysql.spec.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packaging/rpm-uln/mysql.spec.sh b/packaging/rpm-uln/mysql.spec.sh index ec195bc9e16..3fcbd5c1234 100644 --- a/packaging/rpm-uln/mysql.spec.sh +++ b/packaging/rpm-uln/mysql.spec.sh @@ -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 +- Removed directory /usr/share/mysql/solaris/postinstall-solaris to resolve build + error + * Thu Dec 7 2012 Joerg Bruehe - Change the way in which "libmysqld.so" is created: Using all object modules was wrong, gcc / ld can resolve the dependencies from "libmysqld.a". From dc8d01654b7c36f343c4902ba51c3e1fef884356 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Wed, 10 Jul 2013 19:14:41 +0200 Subject: [PATCH 2/3] Updated spec file for Bug#17080138 --- support-files/mysql.spec.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index a4648ca0688..9364fb6b8d3 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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 From 0956325f3dd2e6dae75164d5062ef8b45d5e2c87 Mon Sep 17 00:00:00 2001 From: Balasubramanian Kandasamy Date: Mon, 15 Jul 2013 13:41:27 +0200 Subject: [PATCH 3/3] Removed random passwords feature for Bugfix#17160741 (not applicable for 5.5.X) --- packaging/solaris/postinstall-solaris.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/packaging/solaris/postinstall-solaris.sh b/packaging/solaris/postinstall-solaris.sh index 027969fcf0e..b024d94f158 100644 --- a/packaging/solaris/postinstall-solaris.sh +++ b/packaging/solaris/postinstall-solaris.sh @@ -81,7 +81,6 @@ if [ -n "$INSTALL" ] ; then cd "$mybasedir" scripts/mysql_install_db \ --rpm \ - --random-passwords \ --user=mysql \ --basedir="$mybasedir" \ --datadir=$mydatadir