diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2011-10-19 13:39:43 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2011-10-19 13:39:43 +0200 |
| commit | 1e93ac62bfffa241e47189ee0503a37d000dce6f (patch) | |
| tree | d401cb81cb63ad11b4f8e6bdd1bed86bea7a81f1 /support-files | |
| parent | 3068eee35424cd14f1793f313e25a67fb7eac639 (diff) | |
| parent | d3924fbe843982870dc4a3530b065adaf54a834e (diff) | |
| download | mariadb-git-1e93ac62bfffa241e47189ee0503a37d000dce6f.tar.gz | |
Merge the changes of 5.5.17 back into main 5.5
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index fad745676e5..a3d8554188e 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1019,7 +1019,6 @@ echo "=====" >> $STATUS_HISTORY %doc %attr(644, root, man) %{_mandir}/man1/replace.1* %doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1* %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1* -%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1* %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf @@ -1037,7 +1036,6 @@ echo "=====" >> $STATUS_HISTORY %attr(755, root, root) %{_bindir}/mysql_setpermission %attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql %attr(755, root, root) %{_bindir}/mysql_upgrade -%attr(755, root, root) %{_bindir}/mysql_plugin %attr(755, root, root) %{_bindir}/mysql_zap %attr(755, root, root) %{_bindir}/mysqlbug %attr(755, root, root) %{_bindir}/mysqld_multi @@ -1148,6 +1146,11 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com> + +- Fix duplicate mentioning of "mysql_plugin" and its manual page, + it is better to keep alphabetic order in the files list (merging!). + * Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com> - Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace |