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 | fc98c60f512918400168b3df9fdaccc84ea136e8 (patch) | |
| tree | 810d3cc7d1a03d79453915de179da372be3fc7c6 | |
| parent | 85d51dd13f3f497b36f056a3d3e3b02856b7ae0e (diff) | |
| parent | d73f2a82245b80bba8cb41ebf06c43e7fb01791b (diff) | |
| download | mariadb-git-fc98c60f512918400168b3df9fdaccc84ea136e8.tar.gz | |
Merge 5.1 => 5.5
| -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 |