Add doc package and move all documentation to it

Change-Id: Id7d483a6abda7c8df9ad48edec3a3bd37e59862a

diff --git a/centos7/rpm/SPECS/openstack-heat.spec b/centos7/rpm/SPECS/openstack-heat.spec
index 0e4dbd8f6b1d117a2a1fec5a81914c7cf9c61c4b..1da70fa7a6177c8fa97398d2fcf94f5b0ff020ac 100644 (file)
--- a/centos7/rpm/SPECS/openstack-heat.spec
+++ b/centos7/rpm/SPECS/openstack-heat.spec
@@ -246,11 +246,6 @@ Components common to all OpenStack Heat services
 %config(noreplace) %attr(-, root, heat) %{_sysconfdir}/heat/policy.json
 %config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/environment.d/*
 %config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/templates/*
-%if 0%{?with_doc}
-%{_mandir}/man1/heat-keystone-setup.1.gz
-%{_mandir}/man1/heat-keystone-setup-domain.1.gz
-%{_mandir}/man1/heat-manage.1.gz
-%endif
 
 %pre common
 # 187:187 for heat - rhbz#845078
@@ -260,6 +255,17 @@ useradd --uid 187 -r -g heat -d %{_sharedstatedir}/heat -s /sbin/nologin \
 -c "OpenStack Heat Daemons" heat
 exit 0
 
+%if 0%{?with_doc}
+%package doc
+Summary: Documentation for Heat
+Group:   Documentation
+
+%description doc
+Heat provides AWS CloudFormation and CloudWatch functionality for OpenStack
+.
+This package contains documentation for Heat.
+%endif
+
 # docker resource
 %package docker
 Summary: The Heat Docker resource
@@ -287,14 +293,8 @@ OpenStack API for starting CloudFormation templates on OpenStack
 
 %files engine
 %doc README.rst LICENSE
-%if 0%{?with_doc}
-%doc doc/build/html/man/heat-engine.html
-%endif
 %{_bindir}/heat-engine
 %{_unitdir}/openstack-heat-engine.service
-%if 0%{?with_doc}
-%{_mandir}/man1/heat-engine.1.gz
-%endif
 
 %post engine
 %systemd_post openstack-heat-engine.service
@@ -320,14 +320,8 @@ OpenStack-native ReST API to the Heat Engine
 
 %files api
 %doc README.rst LICENSE
-%if 0%{?with_doc}
-%doc doc/build/html/man/heat-api.html
-%endif
 %{_bindir}/heat-api
 %{_unitdir}/openstack-heat-api.service
-%if 0%{?with_doc}
-%{_mandir}/man1/heat-api.1.gz
-%endif
 
 %post api
 %systemd_post openstack-heat-api.service
@@ -353,14 +347,8 @@ AWS CloudFormation-compatible API to the Heat Engine
 
 %files api-cfn
 %doc README.rst LICENSE
-%if 0%{?with_doc}
-%doc doc/build/html/man/heat-api-cfn.html
-%endif
 %{_bindir}/heat-api-cfn
 %{_unitdir}/openstack-heat-api-cfn.service
-%if 0%{?with_doc}
-%{_mandir}/man1/heat-api-cfn.1.gz
-%endif
 
 %post api-cfn
 %systemd_post openstack-heat-api-cloudwatch.service
@@ -386,14 +374,12 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 %files api-cloudwatch
 %doc README.rst LICENSE
-%if 0%{?with_doc}
-%doc doc/build/html/man/heat-api-cloudwatch.html
-%endif
 %{_bindir}/heat-api-cloudwatch
 %{_unitdir}/openstack-heat-api-cloudwatch.service
-%if 0%{?with_doc}
-%{_mandir}/man1/heat-api-cloudwatch.1.gz
-%endif
+
+%files doc
+%{_mandir}/man1/*
+%doc LICENSE doc/build/html
 
 %post api-cloudwatch
 %systemd_post openstack-heat-api-cfn.service
@@ -406,7 +392,10 @@ AWS CloudWatch-compatible API to the Heat Engine
 
 
 %changelog
-* Thu Sep 17 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 5.0.0.0rc1-1%{?dist}~mos8.0.1
+* Thu Oct  8 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 1:5.0.0.0rc1-1%{?dist}~mos8.0.2
+- Add doc package and move all documentation to it
+
+* Thu Sep 17 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 1:5.0.0.0rc1-1%{?dist}~mos8.0.1
 - Update to 5.0.0
 - .spec is from https://raw.githubusercontent.com/openstack-packages/heat/rpm-master/openstack-heat.spec
 - Update requirements according to global requirements of Liberty