Updated mysql.spec.sh file for br16298542

2 files changed, 8 insertions, 13 deletions

diff --git a/support-files/MySQL-shared-compat.spec.sh b/support-files/MySQL-shared-compat.spec.sh
index b8b27863b3d..9e9bc26e294 100644
--- a/support-files/MySQL-shared-compat.spec.sh
+++ b/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
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 3a63e7082f6..226ff5d0dfc 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -286,10 +286,9 @@ documentation and the manual for more information.
 Summary:	MySQL: a very fast and reliable SQL database server
 Group:		Applications/Databases
 Requires:	%{distro_requires}
-Obsoletes:	MySQL MySQL-server
 Obsoletes:	mysql mysql-server mysql-advanced mysql-server-advanced
 Obsoletes:	MySQL-server-classic MySQL-server-community MySQL-server-enterprise
-Obsoletes:	MySQL-server-advanced MySQL-server-advanced-gpl MySQL-server-enterprise-gpl
+Obsoletes:	MySQL-server-advanced-gpl MySQL-server-enterprise-gpl
 Provides:	msqlormysql MySQL MySQL-server
 Provides:	mysql 
 
@@ -322,9 +321,8 @@ package "MySQL-client%{product_suffix}" as well!
 Summary:	MySQL - Client
 Group:		Applications/Databases
 Obsoletes:	mysql mysql-advanced
-Obsoletes:	MySQL-client
 Obsoletes:	MySQL-client-classic MySQL-client-community MySQL-client-enterprise
-Obsoletes:	MySQL-client-advanced MySQL-client-advanced-gpl MySQL-client-enterprise-gpl
+Obsoletes:	MySQL-client-advanced-gpl MySQL-client-enterprise-gpl
 Provides:	MySQL-client
 Provides:	mysql 
 
@@ -339,10 +337,9 @@ Summary:	MySQL - Test suite
 Group:		Applications/Databases
 Requires:	MySQL-client perl
 Conflicts:	mysql-test mysql-test-advanced
-Obsoletes:	MySQL-test
 Obsoletes:	mysql-bench MySQL-bench
 Obsoletes:	MySQL-test-classic MySQL-test-community MySQL-test-enterprise
-Obsoletes:	MySQL-test-advanced MySQL-test-advanced-gpl MySQL-test-enterprise-gpl
+Obsoletes:	MySQL-test-advanced-gpl MySQL-test-enterprise-gpl
 Provides:	MySQL-test
 AutoReqProv:	no
 
@@ -356,9 +353,8 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
 Summary:	MySQL - Development header files and libraries
 Group:		Applications/Databases
 Conflicts:	mysql-devel mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced
-Obsoletes:	MySQL-devel
 Obsoletes:	MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise
-Obsoletes:	MySQL-devel-advanced MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl
+Obsoletes:	MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl
 Provides:	MySQL-devel
 
 %description -n MySQL-devel%{product_suffix}
@@ -373,9 +369,9 @@ Summary:	MySQL - Shared libraries
 Group:		Applications/Databases
 Obsoletes:	MySQL-shared-standard MySQL-shared-pro
 Obsoletes:	MySQL-shared-pro-cert MySQL-shared-pro-gpl
-Obsoletes:	MySQL-shared-pro-gpl-cert MySQL-shared
+Obsoletes:	MySQL-shared-pro-gpl-cert 
 Obsoletes:	MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise
-Obsoletes:	MySQL-shared-advanced MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl
+Obsoletes:	MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl
 Provides:	MySQL-shared
 
 %description -n MySQL-shared%{product_suffix}
@@ -388,10 +384,9 @@ Summary:	MySQL - Embedded library
 Group:		Applications/Databases
 Requires:	MySQL-devel
 Conflicts:	mysql-embedded mysql-embedded-advanced
-Obsoletes:	MySQL-embedded
 Obsoletes:	MySQL-embedded-pro
 Obsoletes:	MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise
-Obsoletes:	MySQL-embedded-advanced MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
+Obsoletes:	MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
 Provides:	MySQL-embedded
 
 %description -n MySQL-embedded%{product_suffix}