diff options
Diffstat (limited to 'databases/mariadb100-client/files/patch-support-files_CMakeLists.txt')
| -rw-r--r-- | databases/mariadb100-client/files/patch-support-files_CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt index 314bf0b121fe..a001da40a730 100644 --- a/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt +++ b/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt @@ -1,6 +1,6 @@ ---- 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 @@ +--- support-files/CMakeLists.txt.orig 2017-01-12 01:45:23 UTC ++++ support-files/CMakeLists.txt +@@ -41,15 +41,18 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -19,9 +19,9 @@ 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 @@ +@@ -69,8 +72,10 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) + ADD_SUBDIRECTORY(SELinux) ENDIF() + ENDIF() @@ -30,7 +30,7 @@ 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 @@ +@@ -94,6 +99,7 @@ IF(UNIX) DESTINATION ${inst_location} COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) @@ -38,7 +38,7 @@ IF (INSTALL_SYSCONFDIR) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d -@@ -101,6 +107,7 @@ +@@ -103,6 +109,7 @@ IF(UNIX) RENAME mysql COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) |