mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
MDEV-22552: mytop packaging
`mytop` and `my_print_defaults` for RPM - Add `mytop` to client package - Add man page of `my_print_defaults` to client package - Add dependencies for RPMs - Remove old comment - Remove dead link Reviewed by: serg@mariadb.com
This commit is contained in:
parent
2011fcf87d
commit
395a033237
4 changed files with 11 additions and 10 deletions
|
@ -150,11 +150,14 @@ ENDMACRO(SETA)
|
|||
|
||||
SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
|
||||
"mysql-client"
|
||||
"MySQL-client")
|
||||
"MySQL-client"
|
||||
"mytop <= 1.7")
|
||||
SETA(CPACK_RPM_client_PACKAGE_PROVIDES
|
||||
"MySQL-client"
|
||||
"mysql-client")
|
||||
|
||||
"mysql-client"
|
||||
"mytop")
|
||||
SET(CPACK_RPM_client_PACKAGE_CONFLICTS
|
||||
"MariaDB-server <= 10.5.10")
|
||||
SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
|
||||
"MySQL-devel")
|
||||
SETA(CPACK_RPM_devel_PACKAGE_PROVIDES
|
||||
|
@ -180,7 +183,7 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES
|
|||
|
||||
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
|
||||
"${CPACK_RPM_PACKAGE_REQUIRES}"
|
||||
"MariaDB-client")
|
||||
"MariaDB-client >= 10.5.11")
|
||||
|
||||
IF(WITH_WSREP)
|
||||
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
|
||||
|
@ -223,7 +226,7 @@ ALTERNATIVE_NAME("test" "mysql-test")
|
|||
IF(RPM MATCHES "(rhel|centos)6")
|
||||
ALTERNATIVE_NAME("client" "mysql")
|
||||
ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
|
||||
SET(epoch 1:) # this is fedora
|
||||
SET(epoch 1:)
|
||||
ALTERNATIVE_NAME("client" "mariadb")
|
||||
ALTERNATIVE_NAME("client" "mysql")
|
||||
ALTERNATIVE_NAME("devel" "mariadb-devel")
|
||||
|
|
|
@ -64,8 +64,6 @@
|
|||
#
|
||||
# - INSTALL_UNIX_ADDRDIR (path to mysql.sock)
|
||||
#
|
||||
# When changing this page, _please_ do not forget to update public Wiki
|
||||
# http://forge.mysql.com/wiki/CMake#Fine-tuning_installation_paths
|
||||
|
||||
IF(NOT INSTALL_LAYOUT)
|
||||
IF(DEB)
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
|
||||
|
||||
SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
|
||||
SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1
|
||||
aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1
|
||||
aria_s3_copy.1
|
||||
myisamlog.1 myisampack.1 mysql.server.1 mariadb-conv.1
|
||||
|
@ -34,7 +34,7 @@ SET(MAN8_SERVER mysqld.8)
|
|||
SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
|
||||
mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
|
||||
mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mytop.1
|
||||
mysql_plugin.1 mysql_embedded.1)
|
||||
mysql_plugin.1 mysql_embedded.1 my_print_defaults.1)
|
||||
SET(MAN1_DEVEL mysql_config.1)
|
||||
SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
|
||||
mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1
|
||||
|
|
|
@ -253,7 +253,7 @@ SET(mysql_config_COMPONENT Development)
|
|||
SET(msql2mysql_COMPONENT Client)
|
||||
SET(mariadb-access_COMPONENT Client)
|
||||
SET(mariadb-find-rows_COMPONENT Client)
|
||||
SET(mytop_COMPONENT Mytop)
|
||||
SET(mytop_COMPONENT Client)
|
||||
|
||||
IF(WIN32)
|
||||
# On Windows, some .sh and some .pl.in files are configured
|
||||
|
|
Loading…
Reference in a new issue