Skip to content

Commit 8c2edd0

Browse files
committed
Add man pages for lz4_decompress and zlib_decompress to rpm spec files.
1 parent f3db9bf commit 8c2edd0

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

packaging/rpm-fedora/mysql.spec.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,6 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded
485485
# Remove upcoming man pages, to avoid breakage when they materialize
486486
# Keep this comment as a placeholder for future cases
487487
# 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
490488

491489
%check
492490
%if 0%{?runselftest}
@@ -556,6 +554,8 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
556554
%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
557555
%attr(644, root, root) %{_mandir}/man1/resolveip.1*
558556
%attr(644, root, root) %{_mandir}/man1/mysql_ssl_rsa_setup.1*
557+
%attr(644, root, root) %{_mandir}/man1/lz4_decompress.1*
558+
%attr(644, root, root) %{_mandir}/man1/zlib_decompress.1*
559559

560560
%config(noreplace) %{_sysconfdir}/my.cnf
561561
%dir %{_sysconfdir}/my.cnf.d
@@ -822,11 +822,14 @@ datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n
822822
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
823823

824824
%changelog
825+
* Tue Nov 24 2015 Bjorn Munch <[email protected]> - 5.7.10-1
826+
- Included man pages for lz4_decompress and zlib_decompress
827+
825828
* Thu Nov 12 2015 Bjorn Munch <[email protected]> - 5.7.10-1
826829
- Added lines to remove man pages we are not ready to include yet
827830

828831
* Mon Oct 19 2015 Bharathy Satish <[email protected]> - 5.7.10-1
829-
Added new decompression utilities lz4_decompress and zlib_decompress binaries to
832+
- Added new decompression utilities lz4_decompress and zlib_decompress binaries to
830833
client subpackage.
831834

832835
* Sun Aug 2 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.9-1

packaging/rpm-oel/mysql.spec.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,8 +656,6 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded
656656
# Remove upcoming man pages, to avoid breakage when they materialize
657657
# Keep this comment as a placeholder for future cases
658658
# 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
661659

662660
%check
663661
%if 0%{?runselftest}
@@ -752,6 +750,8 @@ fi
752750
%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
753751
%attr(644, root, root) %{_mandir}/man1/resolveip.1*
754752
%attr(644, root, root) %{_mandir}/man1/mysql_ssl_rsa_setup.1*
753+
%attr(644, root, root) %{_mandir}/man1/lz4_decompress.1*
754+
%attr(644, root, root) %{_mandir}/man1/zlib_decompress.1*
755755

756756
%config(noreplace) %{_sysconfdir}/my.cnf
757757
%dir %{_sysconfdir}/my.cnf.d
@@ -1052,11 +1052,14 @@ fi
10521052
%endif
10531053

10541054
%changelog
1055+
* Tue Nov 24 2015 Bjorn Munch <[email protected]> - 5.7.10-1
1056+
- Included man pages for lz4_decompress and zlib_decompress
1057+
10551058
* Thu Nov 12 2015 Bjorn Munch <[email protected]> - 5.7.10-1
10561059
- Added lines to remove man pages we are not ready to include yet
10571060

10581061
* Mon Oct 19 2015 Bharathy Satish <[email protected]> - 5.7.10-1
1059-
Added new decompression utilities lz4_decompress and zlib_decompress binaries to
1062+
- Added new decompression utilities lz4_decompress and zlib_decompress binaries to
10601063
client subpackage.
10611064

10621065
* Tue Sep 29 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.9-1

packaging/rpm-sles/mysql.spec.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,6 @@ rm -f %{buildroot}%{_datadir}/mysql/win_install_firewall.sql
470470
# Remove upcoming man pages, to avoid breakage when they materialize
471471
# Keep this comment as a placeholder for future cases
472472
# 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
475473

476474
# rcmysql symlink
477475
install -d %{buildroot}%{_sbindir}
@@ -576,6 +574,8 @@ fi
576574
%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
577575
%attr(644, root, root) %{_mandir}/man1/resolveip.1*
578576
%attr(644, root, root) %{_mandir}/man1/mysql_ssl_rsa_setup.1*
577+
%attr(644, root, root) %{_mandir}/man1/lz4_decompress.1*
578+
%attr(644, root, root) %{_mandir}/man1/zlib_decompress.1*
579579

580580
%config(noreplace) %{_sysconfdir}/my.cnf
581581
%dir %{_sysconfdir}/my.cnf.d
@@ -861,11 +861,14 @@ fi
861861
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
862862

863863
%changelog
864+
* Tue Nov 24 2015 Bjorn Munch <[email protected]> - 5.7.10-1
865+
- Included man pages for lz4_decompress and zlib_decompress
866+
864867
* Thu Nov 12 2015 Bjorn Munch <[email protected]> - 5.7.10-1
865868
- Added lines to remove man pages we are not ready to include yet
866869

867870
* Mon Oct 19 2015 Bharathy Satish <[email protected]> - 5.7.10-1
868-
Added new decompression utilities lz4_decompress and zlib_decompress binaries to
871+
- Added new decompression utilities lz4_decompress and zlib_decompress binaries to
869872
client subpackage.
870873

871874
* Tue Sep 29 2015 Balasubramanian Kandasamy <[email protected]> - 5.7.9-1

0 commit comments

Comments
 (0)