Commit 350eef0e authored by Joerg Bruehe's avatar Joerg Bruehe

Protect traditional RPMs that "SPECIFIC-ULN/" will not break their packaging.

parent 6608ea8f
...@@ -26,12 +26,27 @@ IF(UNIX) ...@@ -26,12 +26,27 @@ IF(UNIX)
# Left in current directory, to be taken during build # Left in current directory, to be taken during build
CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY) CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h SET(PATCHES
mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch mysql-5.5-errno.patch
mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch mysql-5.5-fix-tests.patch
mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch mysql-5.5-libdir.patch
mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c) mysql-5.5-mtr1.patch
INSTALL(FILES ${ulnfile} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) mysql-5.5-stack-guard.patch
ENDFOREACH() mysql-5.5-testing.patch
mysql-chain-certs.patch
mysql-expired-certs.patch
mysql-install-test.patch
mysql-strmov.patch)
SET(OTHER
filter-requires-mysql.sh
generate-tarball.sh
my.cnf
my_config.h
mysql-embedded-check.c
mysql.init
scriptstub.c)
INSTALL(FILES ${PATCHES} ${OTHER} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
ENDIF() ENDIF()
# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
...@@ -406,6 +406,9 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ ...@@ -406,6 +406,9 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
# Be strict about variables, bail at earliest opportunity, etc. # Be strict about variables, bail at earliest opportunity, etc.
set -eu set -eu
# Get rid of stuff for ULN RPMs - not needed here
rm -fr %{src_dir}/SPECIFIC-ULN/
# Optional package files # Optional package files
touch optional-files-devel touch optional-files-devel
...@@ -1146,6 +1149,10 @@ echo "=====" >> $STATUS_HISTORY ...@@ -1146,6 +1149,10 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees) # merging BK trees)
############################################################################## ##############################################################################
%changelog %changelog
* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com> * Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Fix duplicate mentioning of "mysql_plugin" and its manual page, - Fix duplicate mentioning of "mysql_plugin" and its manual page,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment