mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug #27021754 MYSQLTEST MAN PAGES WILL BE REMOVED, PACKAGING MUST BE PREPARED

Browse source 
Followup: now that the man pages have actually been removed,
 we no longer need to take deliberate action to ignore them.
 Thus we can remove that part of the original change.

 RPM: drop the conditional removal
 DEB: remove from the exclude list
This commit is contained in:
Bjorn Munch 2018-01-11 09:31:36 +01:00
parent 2b1fe48504
commit 20e75a3efd
3 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packaging/rpm-oel/mysql.spec.in
View file

@ -1,4 +1,4 @@
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -609,14 +609,6 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded
rm -rf %{buildroot}%{_bindir}/mysql_setpermission
rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
# Remove obsoleted man pages
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
%check
%if 0%{?runselftest}
pushd release
@ -920,6 +912,9 @@ fi
%endif
%changelog
* Wed Jan 10 2018 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.60-1
- No longer need to remove obsoleted mysqltest man pages
* Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.59-1
- Remove obsoleted mysqltest man pages

13
packaging/rpm-sles/mysql.spec.in
View file

@ -1,4 +1,4 @@
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -446,14 +446,6 @@ rm -rf %{buildroot}%{_bindir}/mysql_embedded
rm -rf %{buildroot}%{_bindir}/mysql_setpermission
rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
# Remove obsoleted man pages
rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1
rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1
rm -f %{buildroot}%{_mandir}/man1/mysql_client_test_embedded.1
rm -f %{buildroot}%{_mandir}/man1/mysqltest.1
rm -f %{buildroot}%{_mandir}/man1/mysqltest_embedded.1
# rcmysql symlink
install -d %{buildroot}%{_sbindir}
ln -sf %{_initrddir}/mysql %{buildroot}%{_sbindir}/rcmysql
@ -742,6 +734,9 @@ fi
%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
%changelog
* Wed Jan 10 2018 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.60-1
- No longer need to remove obsoleted mysqltest man pages
* Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.59-1
- Remove obsoleted mysqltest man pages

11
support-files/mysql.spec.sh
View file

@ -1,4 +1,4 @@
# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -621,12 +621,6 @@ install -m 644 "%{malloc_lib_source}" \
# Remove man pages we explicitly do not want to package, avoids 'unpackaged
# files' warning.
# This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
rm -f $RBR%{_mandir}/man1/mysql-stress-test.pl.1
rm -f $RBR%{_mandir}/man1/mysql-test-run.pl.1
rm -f $RBR%{_mandir}/man1/mysql_client_test.1
rm -f $RBR%{_mandir}/man1/mysql_client_test_embedded.1
rm -f $RBR%{_mandir}/man1/mysqltest.1
rm -f $RBR%{_mandir}/man1/mysqltest_embedded.1
##############################################################################
# Post processing actions, i.e. when installed
@ -1228,6 +1222,9 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
* Wed Jan 10 2018 Bjorn Munch <bjorn.munch@oracle.com>
- No longer need to remove obsoleted mysqltest man pages
* Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com>
- Remove obsoleted mysqltest man pages