bzr push into mysql-5.5 branch (build:3369 to 3370) Bug#57175

[MySQL Build Team]

 3370 MySQL Build Team	2011-03-03
      Implementing Bug #57175	MySQL source tarballs should include generated spec file

    modified:
      cmake/make_dist.cmake.in
 3369 Alexander Barkov	2011-03-03 [merge]
      Merging from mysql-5.1

    modified:
      mysql-test/r/ctype_sjis.result
      mysql-test/r/ctype_ucs.result
      mysql-test/t/ctype_sjis.test
      mysql-test/t/ctype_ucs.test
      sql/item_strfunc.cc
      sql/item_strfunc.h
=== modified file 'cmake/make_dist.cmake.in'
--- a/cmake/make_dist.cmake.in	2011-02-11 14:55:25 +0000
+++ b/cmake/make_dist.cmake.in	2011-03-03 21:46:12 +0000
@@ -29,6 +29,8 @@ SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_MAKE_PROGRAM "@CMAKE_MAKE_PROGRAM@")
 SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
 
+SET(VERSION "@VERSION@")
+
 SET(MYSQL_DOCS_LOCATION "@MYSQL_DOCS_LOCATION@")
 
 
@@ -100,6 +102,10 @@ CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/s
 CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
    ${PACKAGE_DIR}/sql/sql_yacc.cc COPYONLY)
 
+# Copy spec files
+CONFIGURE_FILE(${CMAKE_BINARY_DIR}/support-files/mysql.${VERSION}.spec
+   ${PACKAGE_DIR}/support-files/mysql.${VERSION}.spec COPYONLY)
+
 # Add documentation, if user has specified where to find them
 IF(MYSQL_DOCS_LOCATION)
   MESSAGE("Copying documentation files from " ${MYSQL_DOCS_LOCATION})


Attachment: [text/bzr-bundle] bzr/[e-mail]