Skip to content

Commit

Permalink
Bug#34960126 Remove legacy file mysql.info
Browse files Browse the repository at this point in the history
Contents of file is just a reference and is already skipped for
several package formats.

Change-Id: I5da50815d3c580e0ca7c5ed77088575c6424fced
  • Loading branch information
trosten committed Jan 9, 2023
1 parent cf28f7a commit 18b2dd3
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 21 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Expand Up @@ -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
#
Expand All @@ -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
)
Expand Down
3 changes: 0 additions & 3 deletions Docs/mysql.info

This file was deleted.

3 changes: 1 addition & 2 deletions 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,
Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions 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,
Expand Down Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions 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,
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions 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,
Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions 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,
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 18b2dd3

Please sign in to comment.