From e28785eb2fd780fd16ce2d7803dfc7c8152bf06b Mon Sep 17 00:00:00 2001
From: Joerg Bruehe <joerg.bruehe@oracle.com>
Date: Tue, 12 Jun 2012 11:01:41 +0200
Subject: [PATCH] Still work on getting the "SPECIFIC-ULN/" files into the
 build.

"INSTALL" was wrong, happens too late,
but "CONFIGURE_FILES(... COPYONLY)" should hopefully do it.

Traditional RPMs need to be checked, the above might fix their issues.
---
 SPECIFIC-ULN/CMakeLists.txt | 29 +++++++----------------------
 support-files/mysql.spec.sh |  3 ---
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/SPECIFIC-ULN/CMakeLists.txt b/SPECIFIC-ULN/CMakeLists.txt
index 6b920cc6ef2..0b61090d4c7 100644
--- a/SPECIFIC-ULN/CMakeLists.txt
+++ b/SPECIFIC-ULN/CMakeLists.txt
@@ -26,27 +26,12 @@ IF(UNIX)
   # Left in current directory, to be taken during build
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
 
-  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})
+  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)
+    CONFIGURE_FILE(${ulnfile} ${CMAKE_CURRENT_BINARY_DIR}/${ulnfile} COPYONLY)
+  ENDFOREACH()
 ENDIF()
 
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 64016fd2ee6..3589a85228a 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -406,9 +406,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
 # 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