From 18b2dd3ddfbe06bef9a378f1a87e63d494514b0b Mon Sep 17 00:00:00 2001 From: Terje Rosten Date: Mon, 9 Jan 2023 13:19:54 +0100 Subject: [PATCH] Bug#34960126 Remove legacy file mysql.info Contents of file is just a reference and is already skipped for several package formats. Change-Id: I5da50815d3c580e0ca7c5ed77088575c6424fced --- CMakeLists.txt | 6 ------ Docs/mysql.info | 3 --- packaging/deb-in/rules.in | 3 +-- packaging/rpm-docker/mysql.spec.in | 3 +-- packaging/rpm-fedora/mysql.spec.in | 5 +---- packaging/rpm-oel/mysql.spec.in | 3 +-- packaging/rpm-sles/mysql.spec.in | 3 +-- 7 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 Docs/mysql.info diff --git a/CMakeLists.txt b/CMakeLists.txt index 334f3a077bd7..bc9a317152af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2472,11 +2472,6 @@ IF(PACK_SEPARATE_COMPONENTS) SET(CPACK_COMPONENTS_GROUPING IGNORE) ENDIF() -IF(UNIX) - INSTALL(FILES - Docs/mysql.info - DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) -ENDIF() # # RPM installs documentation directly from the source tree # @@ -2502,7 +2497,6 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "glibc*" EXCLUDE PATTERN "linuxthreads.txt" EXCLUDE PATTERN "myisam.txt" EXCLUDE - PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE PATTERN "README.build" EXCLUDE ) diff --git a/Docs/mysql.info b/Docs/mysql.info deleted file mode 100644 index a812a06e149c..000000000000 --- a/Docs/mysql.info +++ /dev/null @@ -1,3 +0,0 @@ - -The MySQL Reference Manual is available in various formats on -http://dev.mysql.com/doc. diff --git a/packaging/deb-in/rules.in b/packaging/deb-in/rules.in index 198b9545705a..8f295fb34c08 100644 --- a/packaging/deb-in/rules.in +++ b/packaging/deb-in/rules.in @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Copyright (c) 2015, 2022, Oracle and/or its affiliates. +# Copyright (c) 2015, 2023, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License, version 2.0, @@ -106,7 +106,6 @@ override_dh_install: dh_install --fail-missing \ -Xusr/bin/i_mysql_client_test \ -Xmysql.server \ - -Xmysql.info \ -XChangeLog \ -Xusr/share/man/man1/mysqlman.1 diff --git a/packaging/rpm-docker/mysql.spec.in b/packaging/rpm-docker/mysql.spec.in index 10f8ddd17525..e67597a3052a 100644 --- a/packaging/rpm-docker/mysql.spec.in +++ b/packaging/rpm-docker/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2022, Oracle and/or its affiliates. +# Copyright (c) 2000, 2023, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License, version 2.0, @@ -350,7 +350,6 @@ rm -rf %{buildroot}%{_libdir}/mysql/libndbclient.so %endif # Remove files pages we explicitly do not want to package -rm -rf %{buildroot}%{_infodir}/mysql.info* rm -f %{buildroot}%{_datadir}/mysql-*/win_install_firewall.sql rm -f %{buildroot}%{_datadir}/mysql-*/audit_log_filter_win_install.sql diff --git a/packaging/rpm-fedora/mysql.spec.in b/packaging/rpm-fedora/mysql.spec.in index c31d9c6012b7..c7859972198e 100644 --- a/packaging/rpm-fedora/mysql.spec.in +++ b/packaging/rpm-fedora/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2022, Oracle and/or its affiliates. +# Copyright (c) 2000, 2023, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License, version 2.0, @@ -631,9 +631,6 @@ if %multilib_capable ; then echo "%{_bindir}/mysql_config-%{__isa_bits}" >> devel.list fi -# Remove files pages we explicitly do not want to package -rm -rf %{buildroot}%{_infodir}/mysql.info* - %check %if 0%{?runselftest} || 0%{?with_unittests} pushd release diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index c0d9ba85340c..75262406a3c8 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2022, Oracle and/or its affiliates. +# Copyright (c) 2000, 2023, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License, version 2.0, @@ -1031,7 +1031,6 @@ install -D -p -m 0644 packaging/rpm-common/mysqlrouter.conf %{buildroot}%{_sysco %endif # with_router # Remove files pages we explicitly do not want to package -rm -rf %{buildroot}%{_infodir}/mysql.info* rm -f %{buildroot}%{_datadir}/mysql-*/win_install_firewall.sql rm -f %{buildroot}%{_datadir}/mysql-*/audit_log_filter_win_install.sql diff --git a/packaging/rpm-sles/mysql.spec.in b/packaging/rpm-sles/mysql.spec.in index 3270edad74e8..695973d4d35c 100644 --- a/packaging/rpm-sles/mysql.spec.in +++ b/packaging/rpm-sles/mysql.spec.in @@ -1,4 +1,4 @@ -# Copyright (c) 2000, 2022, Oracle and/or its affiliates. +# Copyright (c) 2000, 2023, Oracle and/or its affiliates. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License, version 2.0, @@ -720,7 +720,6 @@ install -D -p -m 0644 packaging/rpm-common/mysqlrouter.conf %{buildroot}%{_sysco %endif # Remove files pages we explicitly do not want to package -rm -rf %{buildroot}%{_infodir}/mysql.info* rm -f %{buildroot}%{_datadir}/mysql-*/win_install_firewall.sql rm -f %{buildroot}%{_datadir}/mysql-*/audit_log_filter_win_install.sql