diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-10-30 04:12:24 +0100 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2013-10-30 04:12:24 +0100 |
| commit | ef2238b88e3284bc66ebcb851e71c09e4b151ec5 (patch) | |
| tree | 810d3cc7d1a03d79453915de179da372be3fc7c6 /support-files | |
| parent | ac8e8253b7fadb2f4ae9008ca77fa8a4083ab3bd (diff) | |
| parent | 3d553c27b6e43a897adab92f020f463717b4bf5b (diff) | |
| download | mariadb-git-ef2238b88e3284bc66ebcb851e71c09e4b151ec5.tar.gz | |
Merge 5.1 => 5.5
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 800b333a5cf..d8de3a41e7f 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -1058,7 +1058,9 @@ echo "=====" >> $STATUS_HISTORY %doc release/Docs/INFO_BIN* %doc release/support-files/my-*.cnf +%if 0%{?commercial} %doc %attr(644, root, root) %{_infodir}/mysql.info* +%endif %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* @@ -1215,6 +1217,9 @@ echo "=====" >> $STATUS_HISTORY # merging BK trees) ############################################################################## %changelog +* Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> +- Removed non gpl file docs/mysql.info from community packages + * Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - Updated logic to get the correct count of PID files |