Updated Code for Bug#16235828 and Bug#16298542

1 files changed, 26 insertions, 26 deletions

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index bac22fc96a9..22dd3b87db1 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -286,11 +286,11 @@ documentation and the manual for more information.
 Summary:	MySQL: a very fast and reliable SQL database server
 Group:		Applications/Databases
 Requires:	%{distro_requires}
-Provides:	msqlormysql MySQL MySQL-server
-Conflicts:	mysql mysql-server mysql-advanced mysql-server-advanced
-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 
 
 %description -n MySQL-server%{product_suffix}
 The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@@ -320,11 +320,11 @@ package "MySQL-client%{product_suffix}" as well!
 %package -n MySQL-client%{product_suffix}
 Summary:	MySQL - Client
 Group:		Applications/Databases
-Provides:	MySQL-client
-Conflicts:	mysql mysql-advanced
-Obsoletes:	MySQL-client
+Obsoletes:	mysql mysql-advanced
 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 
 
 %description -n MySQL-client%{product_suffix}
 This package contains the standard MySQL clients and administration tools.
@@ -336,12 +336,11 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
 Summary:	MySQL - Test suite
 Group:		Applications/Databases
 Requires:	MySQL-client perl
-Provides:	MySQL-test
 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
 
 %description -n MySQL-test%{product_suffix}
@@ -353,11 +352,10 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
 %package -n MySQL-devel%{product_suffix}
 Summary:	MySQL - Development header files and libraries
 Group:		Applications/Databases
-Provides:	MySQL-devel
 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}
 This package contains the development header files and libraries necessary
@@ -369,12 +367,12 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
 %package -n MySQL-shared%{product_suffix}
 Summary:	MySQL - Shared libraries
 Group:		Applications/Databases
-Provides:	MySQL-shared
 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}
 This package contains the shared libraries (*.so*) which certain languages
@@ -385,12 +383,11 @@ and applications need to dynamically load and use MySQL.
 Summary:	MySQL - Embedded library
 Group:		Applications/Databases
 Requires:	MySQL-devel
-Provides:	MySQL-embedded
 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}
 This package contains the MySQL server as an embedded library.
@@ -719,13 +716,16 @@ if [ -d $mysql_datadir ] ; then
 	echo "MySQL RPM upgrade to version $NEW_VERSION"  > $STATUS_FILE
 	echo "'pre' step running at `date`"          >> $STATUS_FILE
 	echo                                         >> $STATUS_FILE
-	echo "ERR file(s):"                          >> $STATUS_FILE
-	ls -ltr $mysql_datadir/*.err                 >> $STATUS_FILE
-	echo                                         >> $STATUS_FILE
-	echo "Latest 'Version' line in latest file:" >> $STATUS_FILE
-	grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \
+	fcount=`ls -ltr $mysql_datadir/*.err 2>/dev/null | wc -l`       
+        if [ $fcount -gt 0 ] ; then
+             echo "ERR file(s):"                          >> $STATUS_FILE
+	     ls -ltr $mysql_datadir/*.err                 >> $STATUS_FILE
+	     echo                                         >> $STATUS_FILE
+	     echo "Latest 'Version' line in latest file:" >> $STATUS_FILE
+	     grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \
 		tail -1                              >> $STATUS_FILE
-	echo                                         >> $STATUS_FILE
+	     echo                                         >> $STATUS_FILE
+        fi
 
 	if [ -n "$SERVER_TO_START" ] ; then
 		# There is only one PID file, race possibility ignored