List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:June 11 2012 4:04pm
Subject:bzr push into mysql-5.5 branch (joerg.bruehe:3866 to 3867)
View as plain text  
 3867 Joerg Bruehe	2012-06-11
      Adape "SPECIFIC-ULN/mysql-5.5-libdir.patch" to changed comments 
      in "cmake/install_layout.cmake" (pravious changeset).

    modified:
      SPECIFIC-ULN/mysql-5.5-libdir.patch
 3866 Joerg Bruehe	2012-06-11
      More changes to supporting the build of RPMs for ULN
      from the MySQL 5.5 source tree.
      
      Contrary to the comment, the spec file for these ULN RPMs
      was missing in the previous changeset (blame ".bzrignore").
      
      This change now brings said spec file, and it adds cmake
      handling for the new files.
      
      Still for internal tool tests only, not yet ready for publishing.
     @ CMakeLists.txt
        Add the subdirectory holding specific stuff
        for the RedHat-compatible RPMs for ULN.
     @ cmake/install_layout.cmake
        Explicitly mention my the ULN RPMs are handled.

    added:
      SPECIFIC-ULN/CMakeLists.txt
      SPECIFIC-ULN/mysql.spec.sh
    modified:
      CMakeLists.txt
      cmake/install_layout.cmake
=== modified file 'SPECIFIC-ULN/mysql-5.5-libdir.patch'
--- a/SPECIFIC-ULN/mysql-5.5-libdir.patch	2012-06-08 17:44:06 +0000
+++ b/SPECIFIC-ULN/mysql-5.5-libdir.patch	2012-06-11 16:02:30 +0000
@@ -7,8 +7,8 @@ Similar, the server is now in "/usr/libe
 diff -Naur mysql-5.5.17.orig/cmake/install_layout.cmake mysql-5.5.17/cmake/install_layout.cmake
 --- mysql-5.5.17.orig/cmake/install_layout.cmake	2011-06-30 15:46:53 +0000
 +++ mysql-5.5.17/cmake/install_layout.cmake	2011-10-27 16:40:10 +0000
-@@ -135,14 +135,14 @@ SET(INSTALL_SBINDIR_RPM                 
- # RPM layout
+@@ -140,14 +140,14 @@ SET(INSTALL_SBINDIR_RPM                 
+ # be applied at build time via "rpmbuild".
  #
  SET(INSTALL_BINDIR_RPM                  "bin")
 -SET(INSTALL_SBINDIR_RPM                 "sbin")

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (joerg.bruehe:3866 to 3867) Joerg Bruehe12 Jun