diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 13:23:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-11-24 13:23:44 +0300 |
| commit | 7a3636c1af6fb82eaad236f85196b5a5bd03c705 (patch) | |
| tree | 7cfdb826dde4f4515f7f806908ac679e40e7140b /support-files | |
| parent | ee2b93944b2f7267690f29639da7e881f39379fa (diff) | |
| parent | d7a4672cf7a42e9676659292535fc5b4ef3b6af7 (diff) | |
| download | mariadb-git-7a3636c1af6fb82eaad236f85196b5a5bd03c705.tar.gz | |
Merge from mysql-5.1-bugteam.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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: |