Skip to content

Commit 395a033

Browse files
author
Anel Husakovic
committed
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
1 parent 2011fcf commit 395a033

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

cmake/cpack_rpm.cmake

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,14 @@ ENDMACRO(SETA)
150150

151151
SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
152152
"mysql-client"
153-
"MySQL-client")
153+
"MySQL-client"
154+
"mytop <= 1.7")
154155
SETA(CPACK_RPM_client_PACKAGE_PROVIDES
155156
"MySQL-client"
156-
"mysql-client")
157-
157+
"mysql-client"
158+
"mytop")
159+
SET(CPACK_RPM_client_PACKAGE_CONFLICTS
160+
"MariaDB-server <= 10.5.10")
158161
SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
159162
"MySQL-devel")
160163
SETA(CPACK_RPM_devel_PACKAGE_PROVIDES
@@ -180,7 +183,7 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES
180183

181184
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
182185
"${CPACK_RPM_PACKAGE_REQUIRES}"
183-
"MariaDB-client")
186+
"MariaDB-client >= 10.5.11")
184187

185188
IF(WITH_WSREP)
186189
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
@@ -223,7 +226,7 @@ ALTERNATIVE_NAME("test" "mysql-test")
223226
IF(RPM MATCHES "(rhel|centos)6")
224227
ALTERNATIVE_NAME("client" "mysql")
225228
ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
226-
SET(epoch 1:) # this is fedora
229+
SET(epoch 1:)
227230
ALTERNATIVE_NAME("client" "mariadb")
228231
ALTERNATIVE_NAME("client" "mysql")
229232
ALTERNATIVE_NAME("devel" "mariadb-devel")

cmake/install_layout.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464
#
6565
# - INSTALL_UNIX_ADDRDIR (path to mysql.sock)
6666
#
67-
# When changing this page, _please_ do not forget to update public Wiki
68-
# http://forge.mysql.com/wiki/CMake#Fine-tuning_installation_paths
6967

7068
IF(NOT INSTALL_LAYOUT)
7169
IF(DEB)

man/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
1515

16-
SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
16+
SET(MAN1_SERVER innochecksum.1 myisam_ftdump.1 myisamchk.1
1717
aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1
1818
aria_s3_copy.1
1919
myisamlog.1 myisampack.1 mysql.server.1 mariadb-conv.1
@@ -34,7 +34,7 @@ SET(MAN8_SERVER mysqld.8)
3434
SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
3535
mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
3636
mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mytop.1
37-
mysql_plugin.1 mysql_embedded.1)
37+
mysql_plugin.1 mysql_embedded.1 my_print_defaults.1)
3838
SET(MAN1_DEVEL mysql_config.1)
3939
SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
4040
mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1

scripts/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ SET(mysql_config_COMPONENT Development)
253253
SET(msql2mysql_COMPONENT Client)
254254
SET(mariadb-access_COMPONENT Client)
255255
SET(mariadb-find-rows_COMPONENT Client)
256-
SET(mytop_COMPONENT Mytop)
256+
SET(mytop_COMPONENT Client)
257257

258258
IF(WIN32)
259259
# On Windows, some .sh and some .pl.in files are configured

0 commit comments

Comments
 (0)