summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg.bruehe@oracle.com>2011-09-13 12:32:53 +0200
committerJoerg Bruehe <joerg.bruehe@oracle.com>2011-09-13 12:32:53 +0200
commit3690fa63e3c5be50a2d7b276cff24f26f06fb6f5 (patch)
tree392af042cabef9a60f0deac5e851edcbaa6b01f2 /support-files
parent3312a023b13a53e9bfb07e5444bdf3a02b33ef86 (diff)
downloadmariadb-git-3690fa63e3c5be50a2d7b276cff24f26f06fb6f5.tar.gz
Bug #58241
Please exclude make_binary_distribution from the distribution With cmake (5.5 and up), "make package" will do it, or cpack. The (generated) "scripts/make_binary_distribution" is just a wrapper around a "cpack" call, with path names set at build time. Similar, "make_win_bin_dist" is not needed any more. scripts/CMakeLists.txt: Cleanup: Append a trailing newline when generating "make_binary_distribution" (which is just a wrapper around a "cpack" call). support-files/mysql.spec.sh: "make_win_bin_dist" is removed from the sources, so its man page is gone, and it need not be removed when creating the RPMs.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 5e999793b5e..78211a4bc38 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -535,7 +535,7 @@ install -m 644 "%{malloc_lib_source}" \
# Remove man pages we explicitly do not want to package, avoids 'unpackaged
# files' warning.
-rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
+# This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
##############################################################################
# Post processing actions, i.e. when installed
@@ -1153,6 +1153,10 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
+* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- "make_win_bin_dist" and its manual are dropped, cmake does it different.
+
* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Add the manual page for "mysql_plugin" to the server package.