From 355a53b9ff91108bb9635aeeb4b9bd3d441715e7 Mon Sep 17 00:00:00 2001
From: Joerg Bruehe <joerg.bruehe@oracle.com>
Date: Thu, 26 Jul 2012 20:24:51 +0200
Subject: [PATCH] Spec file polishing: Handle 'MySQL-*' and 'mysql-*', part 1

---
 support-files/mysql.spec.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index b627b131e71..0cd6f8dc852 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -581,8 +581,13 @@ fi
 # Check if we can safely upgrade.  An upgrade is only safe if it's from one
 # of our RPMs in the same version family.
 
+# Handle both ways of spelling the capability.
 installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
+if [ $? -ne 0 -o -z "$installed" ]; then
+  installed=`rpm -q --whatprovides MySQL-server 2> /dev/null`
+fi
 if [ $? -eq 0 -a -n "$installed" ]; then
+  installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names
   vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
   version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
   myoldvendor='%{mysql_old_vendor}'