From 265bbf5fe172f1ccb68d2b9c1da93dc7ad1c6cee Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 10 Sep 2013 22:59:18 +0200 Subject: introduce sysconf2dir, install tokudb.conf there, both in rpm and deb --- cmake/cpack_rpm.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmake/cpack_rpm.cmake') diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index ee800fca4e4..c21b863c71f 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -86,10 +86,10 @@ SET(ignored "%ignore ${CMAKE_INSTALL_PREFIX}/share/man/man8*" ) -SET(CPACK_RPM_server_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*") -SET(CPACK_RPM_common_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf") -SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*") -SET(CPACK_RPM_client_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*") +SET(CPACK_RPM_server_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*") +SET(CPACK_RPM_common_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONFDIR}/my.cnf") +SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*") +SET(CPACK_RPM_client_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*") SET(CPACK_RPM_compat_USER_FILELIST ${ignored}) SET(CPACK_RPM_devel_USER_FILELIST ${ignored}) SET(CPACK_RPM_test_USER_FILELIST ${ignored}) -- cgit v1.2.1 From d1f2ba398585e46bc93203c04f684a59f9777f8a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 7 Nov 2013 13:22:27 +0100 Subject: MDEV-5250 doesn't install on fedora if mysql is installed when our package is to replace "mysql", it has both provide and obsolete it --- cmake/cpack_rpm.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cmake/cpack_rpm.cmake') diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index c21b863c71f..a8439fcab00 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -127,6 +127,8 @@ SET(CPACK_RPM_test_PACKAGE_PROVIDES "MySQL-test mysql-test") MACRO(ALTERNATIVE_NAME real alt) SET(p "CPACK_RPM_${real}_PACKAGE_PROVIDES") SET(${p} "${${p}} ${alt} ${alt}(x86-32) ${alt}(x86-64) config(${alt})") + SET(o "CPACK_RPM_${real}_PACKAGE_OBSOLETES") + SET(${o} "${${o}} ${alt}") ENDMACRO(ALTERNATIVE_NAME) IF(RPM MATCHES "(rhel|centos)5") -- cgit v1.2.1