bzr push into mysql-5.5 branch (joerg.bruehe:3869 to 3870)

[Joerg Bruehe]

 3870 Joerg Bruehe	2012-06-11
      Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging.

    modified:
      SPECIFIC-ULN/CMakeLists.txt
      support-files/mysql.spec.sh
 3869 Joerg Bruehe	2012-06-11
      cmake syntax error: missed ${...}

    modified:
      SPECIFIC-ULN/CMakeLists.txt
=== modified file 'SPECIFIC-ULN/CMakeLists.txt'
--- a/SPECIFIC-ULN/CMakeLists.txt	2012-06-11 18:30:04 +0000
+++ b/SPECIFIC-ULN/CMakeLists.txt	2012-06-11 20:07:24 +0000
@@ -26,12 +26,27 @@ IF(UNIX)
   # Left in current directory, to be taken during build
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
 
-  FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
-          mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
-          mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch
-          mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
-          mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c)
-    INSTALL(FILES ${ulnfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-  ENDFOREACH()
+  SET(PATCHES
+      mysql-5.5-errno.patch
+      mysql-5.5-fix-tests.patch
+      mysql-5.5-libdir.patch
+      mysql-5.5-mtr1.patch
+      mysql-5.5-stack-guard.patch
+      mysql-5.5-testing.patch
+      mysql-chain-certs.patch
+      mysql-expired-certs.patch
+      mysql-install-test.patch
+      mysql-strmov.patch)
+
+  SET(OTHER
+      filter-requires-mysql.sh
+      generate-tarball.sh
+      my.cnf
+      my_config.h
+      mysql-embedded-check.c
+      mysql.init
+      scriptstub.c)
+
+  INSTALL(FILES ${PATCHES} ${OTHER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 ENDIF()
 

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2011-10-19 11:39:43 +0000
+++ b/support-files/mysql.spec.sh	2012-06-11 20:07:24 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -406,6 +406,9 @@ For a description of MySQL see the base 
 # Be strict about variables, bail at earliest opportunity, etc.
 set -eu
 
+# Get rid of stuff for ULN RPMs - not needed here
+rm -fr %{src_dir}/SPECIFIC-ULN/
+
 # Optional package files
 touch optional-files-devel
 
@@ -1146,6 +1149,10 @@ echo "====="                            
 # merging BK trees)
 ##############################################################################
 %changelog
+* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@stripped>
+
+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
+  
 * Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@stripped>
 
 - Fix duplicate mentioning of "mysql_plugin" and its manual page,

No bundle (reason: useless for push emails).