Attachment #149491 for bug #194434

Lines 11-17 Link Here

(-)mariadb55-client/Makefile (-1 / +4 lines)
11	PATCHDIR= ${.CURDIR}/files	11	PATCHDIR= ${.CURDIR}/files
12	PLIST= ${.CURDIR}/pkg-plist	12	PLIST= ${.CURDIR}/pkg-plist
13		13
14	CONFLICTS_INSTALL= mysql[0-9][0-9]-client-* mariadb[0-46-9][0-9]-client-* mariadb5.[0-46-9]-client-* percona[0-9][0-9]-client-*	14	CONFLICTS_INSTALL= mysql-client- \
		15	mariadb1[0-9][0-9]-client-* \
		16	mariadb5[0-46-9]-client-* \
		17	percona-client-
15		18
16	CMAKE_ARGS+= -DWITHOUT_SERVER=1	19	CMAKE_ARGS+= -DWITHOUT_SERVER=1
17		20

Lines 1-5 Link Here

(-)mariadb55-client/files/patch-CMakeLists.txt (-4 / +4 lines)
1	--- CMakeLists.txt.orig 2014-08-08 03:08:33.378366450 +0300	1	--- CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200
2	+++ CMakeLists.txt 2014-08-08 03:10:04.225360039 +0300	2	+++ CMakeLists.txt 2014-10-17 21:36:43.000000000 +0200
3	@@ -411,28 +411,8 @@	3	@@ -411,28 +411,8 @@
4	ADD_SUBDIRECTORY(extra)	4	ADD_SUBDIRECTORY(extra)
5	ADD_SUBDIRECTORY(libservices)	5	ADD_SUBDIRECTORY(libservices)
Lines 44-51 Link Here
44	+IF(FALSE)	44	+IF(FALSE)
45	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT	45	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT
46	COMPONENT Readme)	46	COMPONENT Readme)
47	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC	47
48	@@ -484,6 +464,7 @@	48	@@ -487,6 +467,7 @@
49	IF(UNIX)	49	IF(UNIX)
50	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)	50	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
51	ENDIF()	51	ENDIF()




--- cmake/jemalloc.cmake.orig	2014-10-08 15:19:51.000000000 +0200
+++ cmake/jemalloc.cmake	2014-11-16 20:27:50.032638191 +0100
@@ -22,11 +22,11 @@
       SET(libname jemalloc)
     ENDIF()
 
-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
     SET(CMAKE_REQUIRED_LIBRARIES)
 
     IF (HAVE_JEMALLOC)
-      SET(LIBJEMALLOC ${libname})
+      SET(LIBJEMALLOC c)
     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
       MESSAGE(FATAL_ERROR "${libname} is not found")
     ENDIF()

Lines 1-7 Link Here

(-)mariadb55-client/files/patch-libservices_CMakeLists.txt (-4 / +4 lines)
1	--- libservices/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200	1	--- libservices/CMakeLists.txt.orig 2014-10-08 15:19:52.000000000 +0200
2	+++ libservices/CMakeLists.txt 2012-12-23 17:32:35.000000000 +0200	2	+++ libservices/CMakeLists.txt 2014-10-17 21:47:48.000000000 +0200
3	@@ -24,4 +24,6 @@	3	@@ -26,4 +26,6 @@
4	debug_sync_service.c)	4	logger_service.c)
5		5
6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})	6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
7	+IF(FALSE)	7	+IF(FALSE)




@@ -1,49 +1,74 @@
---- support-files/CMakeLists.txt.orig	2014-06-13 13:36:52.080474738 +0300
-+++ support-files/CMakeLists.txt	2014-06-13 13:50:59.537282325 +0300
-@@ -41,15 +41,18 @@
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
+--- scripts/CMakeLists.txt.orig	2014-10-08 15:19:53.000000000 +0200
++++ scripts/CMakeLists.txt	2014-10-17 22:44:55.000000000 +0200
+@@ -72,6 +72,7 @@
+ )
  ENDIF()
  
 +IF(FALSE)
- FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-           DESTINATION ${inst_location} COMPONENT IniFiles)
- ENDFOREACH()
+ INSTALL(FILES 
+   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
+   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
+@@ -81,6 +82,7 @@
+   ${FIX_PRIVILEGES_SQL}
+   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
+ )
 +ENDIF()
  
+ # TCMalloc hacks
+ IF(MALLOC_LIB)
+@@ -140,6 +142,7 @@
+ SET(HOSTNAME "hostname")
+ SET(MYSQLD_USER "mysql")
+ 
++IF(FALSE)
+ # Required for mysqlbug until autotools are deprecated, once done remove these
+ # and expand default cmake variables
+ SET(CC ${CMAKE_C_COMPILER})
+@@ -180,6 +183,7 @@
+   DESTINATION ${INSTALL_BINDIR}
+   COMPONENT Server
+   )
++ENDIF()
+ 
+ ENDIF(UNIX)
+ 
+@@ -204,6 +208,7 @@
+   SET(localstatedir ${MYSQL_DATADIR})
+ ENDIF()
+ 
++IF()
  IF(UNIX)
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+  IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -67,8 +70,10 @@
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-     INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
-   ENDIF()
-+  ENDIF()
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
+   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
+@@ -219,6 +224,7 @@
+   COMPONENT Server
+   )
+ ENDIF()
++ENDIF()
  
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+  IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
-@@ -92,6 +97,7 @@
-     DESTINATION ${inst_location} COMPONENT SupportFiles
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+  
- 
-   IF (INSTALL_SYSCONFDIR)
-     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
-@@ -101,6 +107,7 @@
-             RENAME mysql COMPONENT SupportFiles
-             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-             GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+ ENDIF()
- 
-     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
-             COMPONENT Common)
-
+ SET(prefix "${CMAKE_INSTALL_PREFIX}")
+ SET(sysconfdir ${prefix})
+@@ -335,18 +341,8 @@
+   SET(BIN_SCRIPTS
+     msql2mysql
+     mysql_config
+-    mysql_fix_extensions
+-    mysql_setpermission
+-    mysql_secure_installation
+-    mysql_zap
+     mysqlaccess
+-    mysql_convert_table_format
+     mysql_find_rows
+-    mytop
+-    mysqlhotcopy
+-    mysqldumpslow
+-    mysqld_multi
+-    mysqld_safe
+   )
+   FOREACH(file ${BIN_SCRIPTS})
+     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
+@@ -386,4 +382,3 @@
+     COMPONENT Development)
+   ENDIF()
+ ENDIF()
+-

Lines 1-6 Link Here

(-)mariadb55-client/files/patch-scripts_mysql_config.sh (-3 / +3 lines)
1	--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300	1	--- scripts/mysql_config.sh.orig 2014-10-17 21:44:16.000000000 +0200
2	+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300	2	+++ scripts/mysql_config.sh 2014-10-17 21:54:16.000000000 +0200
3	@@ -108,8 +108,11 @@	3	@@ -109,8 +109,11 @@
4	# We intentionally add a space to the beginning and end of lib strings, simplifies replace later	4	# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
5	libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"	5	libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
6	libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "	6	libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "




--- support-files/CMakeLists.txt.orig	2014-10-08 15:19:53.000000000 +0200
+++ support-files/CMakeLists.txt	2014-10-17 22:34:28.000000000 +0200
@@ -41,15 +41,18 @@
   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
 ENDIF()

   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
@@ -69,8 +72,10 @@
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
     INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
   ENDIF()

   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
   
@@ -94,6 +99,7 @@
     DESTINATION ${inst_location} COMPONENT SupportFiles
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+  ENDIF()
 
   IF (INSTALL_SYSCONFDIR)
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
@@ -101,6 +107,7 @@
             RENAME mysql COMPONENT SupportFiles
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
             GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ ENDIF()
 
     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
             COMPONENT Common)

Return to bug 194434

Lines 1-14 Link Here

(-)mariadb55-client/files/patch-cmake__jemalloc.cmake (-11 / +13 lines)
1	--- cmake/jemalloc.cmake.orig 2013-09-20 00:34:22.000000000 +0200	1	--- cmake/jemalloc.cmake.orig 2014-10-08 15:19:51.000000000 +0200
2	+++ cmake/jemalloc.cmake 2013-09-27 22:46:05.791110010 +0200	2	+++ cmake/jemalloc.cmake 2014-11-16 20:27:50.032638191 +0100
3	@@ -37,9 +37,9 @@	3	@@ -22,11 +22,11 @@
4	SET(WITH_JEMALLOC "no")	4	SET(libname jemalloc)
5	ENDIF()	5	ENDIF()
6	IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")	6
7	- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)	7	- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)	8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
		9	SET(CMAKE_REQUIRED_LIBRARIES)
		10
9	IF (HAVE_JEMALLOC)	11	IF (HAVE_JEMALLOC)
10	- SET(LIBJEMALLOC jemalloc)	12	- SET(LIBJEMALLOC ${libname})
11	+ SET(LIBJEMALLOC c)	13	+ SET(LIBJEMALLOC c)
12	ELSEIF (WITH_JEMALLOC STREQUAL "system")	14	ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
13	MESSAGE(FATAL_ERROR "system jemalloc is not found")	15	MESSAGE(FATAL_ERROR "${libname} is not found")
14	ELSEIF (WITH_JEMALLOC STREQUAL "yes")	16	ENDIF()

Line 0 Link Here

(-)mariadb55-client/files/patch-scripts_CMakeLists.txt.rej (+117 lines)
		1	@@ -1,49 +1,74 @@
		2	---- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300
		3	-+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300
		4	-@@ -41,15 +41,18 @@
		5	- SET(inst_location ${INSTALL_SUPPORTFILESDIR})
		6	+--- scripts/CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200
		7	++++ scripts/CMakeLists.txt 2014-10-17 22:44:55.000000000 +0200
		8	+@@ -72,6 +72,7 @@
		9	+ )
		10	ENDIF()
		11
		12	+IF(FALSE)
		13	- FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
		14	- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
		15	- ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
		16	- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
		17	- DESTINATION ${inst_location} COMPONENT IniFiles)
		18	- ENDFOREACH()
		19	+ INSTALL(FILES
		20	+ ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
		21	+ ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
		22	+@@ -81,6 +82,7 @@
		23	+ ${FIX_PRIVILEGES_SQL}
		24	+ DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
		25	+ )
		26	+ENDIF()
		27
		28	+ # TCMalloc hacks
		29	+ IF(MALLOC_LIB)
		30	+@@ -140,6 +142,7 @@
		31	+ SET(HOSTNAME "hostname")
		32	+ SET(MYSQLD_USER "mysql")
		33	+
		34	++IF(FALSE)
		35	+ # Required for mysqlbug until autotools are deprecated, once done remove these
		36	+ # and expand default cmake variables
		37	+ SET(CC ${CMAKE_C_COMPILER})
		38	+@@ -180,6 +183,7 @@
		39	+ DESTINATION ${INSTALL_BINDIR}
		40	+ COMPONENT Server
		41	+ )
		42	++ENDIF()
		43	+
		44	+ ENDIF(UNIX)
		45	+
		46	+@@ -204,6 +208,7 @@
		47	+ SET(localstatedir ${MYSQL_DATADIR})
		48	+ ENDIF()
		49	+
		50	++IF()
		51	IF(UNIX)
		52	- SET(prefix ${CMAKE_INSTALL_PREFIX})
		53	-+ IF(FALSE)
		54	- FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
		55	- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
		56	- ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
		57	-@@ -67,8 +70,10 @@
		58	- INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
		59	- INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
		60	- ENDIF()
		61	-+ ENDIF()
		62	+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
		63	+ ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
		64	+@@ -219,6 +224,7 @@
65	+ COMPONENT Server
66	+ )
67	+ ENDIF()
68	++ENDIF()
69
70	- INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
71	-+ IF(FALSE)
72	- CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
73	- CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
74	-
75	-@@ -92,6 +97,7 @@
76	- DESTINATION ${inst_location} COMPONENT SupportFiles
77	- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
78	- GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
79	-+
80	-
81	- IF (INSTALL_SYSCONFDIR)
82	- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
83	-@@ -101,6 +107,7 @@
84	- RENAME mysql COMPONENT SupportFiles
85	- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
86	- GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
87	-+ ENDIF()
88	-
89	- INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
90	- COMPONENT Common)
91	-
92	+ SET(prefix "${CMAKE_INSTALL_PREFIX}")
93	+ SET(sysconfdir ${prefix})
94	+@@ -335,18 +341,8 @@
95	+ SET(BIN_SCRIPTS
96	+ msql2mysql
97	+ mysql_config
98	+- mysql_fix_extensions
99	+- mysql_setpermission
100	+- mysql_secure_installation
101	+- mysql_zap
102	+ mysqlaccess
103	+- mysql_convert_table_format
104	+ mysql_find_rows
105	+- mytop
106	+- mysqlhotcopy
107	+- mysqldumpslow
108	+- mysqld_multi
109	+- mysqld_safe
110	+ )
111	+ FOREACH(file ${BIN_SCRIPTS})
112	+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
113	+@@ -386,4 +382,3 @@
114	+ COMPONENT Development)
115	+ ENDIF()
116	+ ENDIF()
117	+-

Lines 1-5 Link Here

(-)mariadb55-client/files/patch-support-files_CMakeLists.txt (-13 / +5 lines)
1	--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300	1	--- support-files/CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200
2	+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300	2	+++ support-files/CMakeLists.txt 2014-10-17 22:34:28.000000000 +0200
3	@@ -41,15 +41,18 @@	3	@@ -41,15 +41,18 @@
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})
5	ENDIF()	5	ENDIF()
Lines 19-25 Link Here
19	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)	19	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
20	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	20	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
21	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )	21	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
22	@@ -67,8 +70,10 @@	22	@@ -69,8 +72,10 @@
23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
24	INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)	24	INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
25	ENDIF()	25	ENDIF()
Lines 30-48 Link Here
30	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)	30	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
31	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)	31	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
32		32
33	@@ -92,6 +97,7 @@	33	@@ -94,6 +99,7 @@
34	DESTINATION ${inst_location} COMPONENT SupportFiles	34	DESTINATION ${inst_location} COMPONENT SupportFiles
35	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	35	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
36	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	36	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
37	+	37	+ ENDIF()
38		38
39	IF (INSTALL_SYSCONFDIR)	39	IF (INSTALL_SYSCONFDIR)
40	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d	40	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
41	@@ -101,6 +107,7 @@
42	RENAME mysql COMPONENT SupportFiles
43	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
44	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
45	+ ENDIF()
46
47	INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
48	COMPONENT Common)