bzr commit into mysql-5.5 branch (joerg.bruehe:3453) Bug#37165

[Joerg Bruehe]

#At file:///MySQL/REPO/V55/bug37165-5.5/ based on revid:dmitry.shulga@stripped

 3453 Joerg Bruehe	2011-06-15 [merge]
      Upmerge the fix of bug#37165 from 5.1 to 5.5.
      
      The bug itself was specific to 5.1,
      but some notational cleanup of the RPM spec file applied to 5.5 also.

    modified:
      support-files/mysql.spec.sh
=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2011-02-14 14:53:51 +0000
+++ b/support-files/mysql.spec.sh	2011-06-15 19:15:57 +0000
@@ -421,7 +421,7 @@ mkdir debug
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
-           -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
            -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
@@ -436,7 +436,7 @@ mkdir release
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-           -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
            -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
@@ -812,7 +812,7 @@ if [ -f /etc/redhat-release ] \
 fi
 
 if [ -x sbin/restorecon ] ; then
-  sbin/restorecon -R var/lib/mysql
+        sbin/restorecon -R %{mysqldatadir}
 fi
 
 # Was the server running before the upgrade? If so, restart the new one.
@@ -1126,6 +1126,14 @@ echo "====="                            
 # merging BK trees)
 ##############################################################################
 %changelog
+* Wed Jun 15 2011 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Upmerge a cleanup which was done in 5.1 in the context of fixing
+  bug#37165 "((Generic rpm)) fail to install on Fedora 9 x86_64":
+  The bug applied to 5.1 only (5.5 already calls "/sbin/restorecon"),
+  but some occurrences of "/var/lib/mysql" should be replaced by
+  the spec file variable %{mysqldatadir}.
+
 * Thu Feb 09 2011 Joerg Bruehe <joerg.bruehe@stripped>
 
 - Fix bug#56581: If an installation deviates from the default file locations

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).