Skip to content

Commit b35b2c0

Browse files
committed
Add removal of upcoming decompress man pages, with comment
(cherry picked from commit df7bda79e40a63d86f233fcddb4dfa2574e1338a)
1 parent c9af686 commit b35b2c0

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

packaging/rpm-fedora/mysql.spec.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,12 @@ rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
482482
rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
483483
rm -rf %{buildroot}%{_bindir}/mysql_embedded
484484

485+
# Remove upcoming man pages, to avoid breakage when they materialize
486+
# Keep this comment as a placeholder for future cases
487+
# rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
488+
rm -f %{buildroot}%{_mandir}/man1/lz4_decompress.1
489+
rm -f %{buildroot}%{_mandir}/man1/zlib_decompress.1
490+
485491
%check
486492
%if 0%{?runselftest}
487493
pushd release
@@ -816,6 +822,9 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
816822
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
817823

818824
%changelog
825+
* Thu Nov 12 2015 Bjorn Munch <[email protected]> - 5.7.10-1
826+
- Added lines to remove man pages we are not ready to include yet
827+
819828
* Mon Oct 19 2015 Bharathy Satish <[email protected]> - 5.7.10-1
820829
Added new decompression utilities lz4_decompress and zlib_decompress binaries to
821830
client subpackage.

packaging/rpm-oel/mysql.spec.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,12 @@ rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
653653
rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql
654654
rm -rf %{buildroot}%{_bindir}/mysql_embedded
655655

656+
# Remove upcoming man pages, to avoid breakage when they materialize
657+
# Keep this comment as a placeholder for future cases
658+
# rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
659+
rm -f %{buildroot}%{_mandir}/man1/lz4_decompress.1
660+
rm -f %{buildroot}%{_mandir}/man1/zlib_decompress.1
661+
656662
%check
657663
%if 0%{?runselftest}
658664
pushd release
@@ -1046,6 +1052,9 @@ fi
10461052
%endif
10471053

10481054
%changelog
1055+
* Thu Nov 12 2015 Bjorn Munch <[email protected]> - 5.7.10-1
1056+
- Added lines to remove man pages we are not ready to include yet
1057+
10491058
* Mon Oct 19 2015 Bharathy Satish <[email protected]> - 5.7.10-1
10501059
Added new decompression utilities lz4_decompress and zlib_decompress binaries to
10511060
client subpackage.

packaging/rpm-sles/mysql.spec.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,12 @@ rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
467467
rm -rf %{buildroot}%{_bindir}/mysql_embedded
468468
rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql
469469

470+
# Remove upcoming man pages, to avoid breakage when they materialize
471+
# Keep this comment as a placeholder for future cases
472+
# rm -f %{buildroot}%{_mandir}/man1/<manpage>.1
473+
rm -f %{buildroot}%{_mandir}/man1/lz4_decompress.1
474+
rm -f %{buildroot}%{_mandir}/man1/zlib_decompress.1
475+
470476
# rcmysql symlink
471477
install -d %{buildroot}%{_sbindir}
472478
%if 0%{?systemd}
@@ -855,6 +861,9 @@ fi
855861
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
856862

857863
%changelog
864+
* Thu Nov 12 2015 Bjorn Munch <[email protected]> - 5.7.10-1
865+
- Added lines to remove man pages we are not ready to include yet
866+
858867
* Mon Oct 19 2015 Bharathy Satish <[email protected]> - 5.7.10-1
859868
Added new decompression utilities lz4_decompress and zlib_decompress binaries to
860869
client subpackage.

0 commit comments

Comments
 (0)