Merge from mysql-5.5.31-release

packaging/rpm-uln/mysql.spec.sh

@@ -268,11 +268,12 @@ Requires: bash
 Provides: mysql
 
 # MySQL (with caps) is upstream's spelling of their own RPMs for mysql
-Conflicts: MySQL
+Obsoletes: MySQL
 # mysql-cluster used to be built from this SRPM, but no more
 Obsoletes: mysql-cluster < 5.1.44
 # We need cross-product "Obsoletes:" to allow cross-product upgrades:
-Obsoletes: mysql mysql-advanced
+Obsoletes: mysql < %{version}-%{release} 
+Obsoletes: mysql-advanced < %{version}-%{release}
 
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 %global __perl_requires %{SOURCE999}
@@ -295,8 +296,9 @@ further info.
 Summary: The shared libraries required for MySQL clients
 Group: Applications/Databases
 Requires: /sbin/ldconfig
+Obsoletes: mysql-libs < %{version}-%{release}  
+Obsoletes: mysql-libs-advanced < %{version}-%{release}
 Provides: mysql-libs
-Obsoletes: mysql-libs mysql-libs-advanced
 
 %description -n mysql-libs%{product_suffix}
 The mysql-libs package provides the essential shared libraries for any 
@@ -318,9 +320,10 @@ Requires(preun): initscripts
 Requires(postun): initscripts
 # mysqlhotcopy needs DBI/DBD support
 Requires: perl-DBI, perl-DBD-MySQL
+Obsoletes: MySQL-server
+Obsoletes: mysql-server < %{version}-%{release}
+Obsoletes: mysql-server-advanced < %{version}-%{release}
 Provides: mysql-server
-Conflicts: MySQL-server
-Obsoletes: mysql-server mysql-server-advanced
 
 %description -n mysql-server%{product_suffix}
 MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
@@ -334,9 +337,10 @@ Summary: Files for development of MySQL applications
 Group: Applications/Databases
 Requires: mysql%{product_suffix} = %{version}-%{release}
 Requires: openssl-devel
+Obsoletes: MySQL-devel
+Obsoletes: mysql-devel < %{version}-%{release}
+Obsoletes: mysql-devel-advanced < %{version}-%{release}
 Provides: mysql-devel
-Conflicts: MySQL-devel
-Obsoletes: mysql-devel mysql-devel-advanced
 
 %description -n mysql-devel%{product_suffix}
 MySQL is a multi-user, multi-threaded SQL database server. This
@@ -347,8 +351,9 @@ developing MySQL client applications.
 
 Summary: MySQL as an embeddable library
 Group: Applications/Databases
+Obsoletes: mysql-embedded < %{version}-%{release}
+Obsoletes: mysql-embedded-advanced < %{version}-%{release}
 Provides: mysql-embedded
-Obsoletes: mysql-embedded mysql-embedded-advanced
 
 %description -n mysql-embedded%{product_suffix}
 MySQL is a multi-user, multi-threaded SQL database server. This
@@ -362,8 +367,9 @@ Summary: Development files for MySQL as an embeddable library
 Group: Applications/Databases
 Requires: mysql-embedded%{product_suffix} = %{version}-%{release}
 Requires: mysql-devel%{product_suffix} = %{version}-%{release}
+Obsoletes: mysql-embedded-devel < %{version}-%{release}
+Obsoletes: mysql-embedded-devel-advanced < %{version}-%{release}
 Provides: mysql-embedded-devel
-Obsoletes: mysql-embedded-devel mysql-embedded-devel-advanced
 
 %description -n mysql-embedded-devel%{product_suffix}
 MySQL is a multi-user, multi-threaded SQL database server. This
@@ -376,9 +382,10 @@ Summary: The test suite distributed with MySQL
 Group: Applications/Databases
 Requires: mysql%{product_suffix} = %{version}-%{release}
 Requires: mysql-server%{product_suffix} = %{version}-%{release}
+Obsoletes: MySQL-test
+Obsoletes: mysql-test < %{version}-%{release}
+Obsoletes: mysql-test-advanced < %{version}-%{release}
 Provides: mysql-test
-Conflicts: MySQL-test
-Obsoletes: mysql-test mysql-test-advanced
 
 %description -n mysql-test%{product_suffix}
 MySQL is a multi-user, multi-threaded SQL database server. This

support-files/MySQL-shared-compat.spec.sh

@@ -42,7 +42,7 @@ Autoreqprov:  on
 Version:      %{version_cur}
 Release:      1
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Obsoletes:    MySQL-shared, mysql-shared
+Obsoletes:    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