diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysql/conf_to_src.c | 3 | ||||
| -rw-r--r-- | libmysql/errmsg.c | 3 | ||||
| -rw-r--r-- | libmysql/get_password.c | 3 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 3 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 4 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 4 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 8 |
8 files changed, 13 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89ae82f2c35..07809a8e29b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,7 @@ ENDIF() # RPM installs documentation directly from the source tree # IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql + INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme OPTIONAL diff --git a/libmysql/conf_to_src.c b/libmysql/conf_to_src.c index 785e3cad4c1..f39a2e1856f 100644 --- a/libmysql/conf_to_src.c +++ b/libmysql/conf_to_src.c @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 823f83026c9..b99b3f2de30 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libmysql/get_password.c b/libmysql/get_password.c index 56514a8d864..455b4b3c8f1 100644 --- a/libmysql/get_password.c +++ b/libmysql/get_password.c @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index e9327d770fb..c498ed0f089 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -5,8 +5,7 @@ the Free Software Foundation. There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. View the full text of the exception in file - EXCEPTIONS-CLIENT in the directory of this software distribution. + is applied to this software. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 951699317fd..455bc93e642 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -304,8 +304,8 @@ mv $DEST/bin/mysql_install_db $DEST/scripts/ # Copy readme and license files cp README Docs/INSTALL-BINARY $DEST/ -if [ -f COPYING -a -f EXCEPTIONS-CLIENT ] ; then - cp COPYING EXCEPTIONS-CLIENT $DEST/ +if [ -f COPYING ] ; then + cp COPYING $DEST/ elif [ -f LICENSE.mysql ] ; then cp LICENSE.mysql $DEST/ else diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index aa106a3dfc4..3174d61792a 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -183,8 +183,8 @@ cp ChangeLog $DESTDIR/Docs/ || /bin/true cp support-files/my-*.ini $DESTDIR/ if [ -f COPYING ] ; then - cp COPYING EXCEPTIONS-CLIENT $DESTDIR/ - cp COPYING $DESTDIR/Docs/ + cp COPYING $DESTDIR/ + cp COPYING $DESTDIR/Docs/ fi # ---------------------------------------------------------------------- diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 75021c318e6..09d8219ffe9 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -211,7 +211,6 @@ %define license_files_server %{src_dir}/LICENSE.mysql %define license_type Commercial %else -%define license_files_devel %{src_dir}/EXCEPTIONS-CLIENT %define license_files_server %{src_dir}/COPYING %{src_dir}/README %define license_type GPL %endif @@ -1037,9 +1036,6 @@ echo "=====" >> $STATUS_HISTORY # ---------------------------------------------------------------------------- %files -n MySQL-devel%{product_suffix} -f optional-files-devel %defattr(-, root, root, 0755) -%if %{defined license_files_devel} -%doc %{license_files_devel} -%endif %doc %attr(644, root, man) %{_mandir}/man1/comp_err.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1* %attr(755, root, root) %{_bindir}/mysql_config @@ -1099,6 +1095,10 @@ echo "=====" >> $STATUS_HISTORY - Add a "triggerpostun" to handle the uninstall of the "-community" server RPM. - This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade". +* Wed Nov 24 2010 Alexander Nozdrin <alexander.nozdrin@oracle.com> + +- EXCEPTIONS-CLIENT has been deleted, remove it from here too. + * Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com> - Change the behaviour on installation and upgrade: |