openstack · jengelh · Aug 26, 2017 · Aug 26, 2017
diff --git a/openstack/Bareon/Bareon.spec.j2 b/openstack/Bareon/Bareon.spec.j2
@@ -70,6 +70,7 @@ data, download operating system images and put these images on partitions.
 
 %package doc
 Summary:        Documentation for OpenStack bareon
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 

diff --git a/openstack/Tempest/Tempest.spec.j2 b/openstack/Tempest/Tempest.spec.j2
@@ -65,6 +65,7 @@ deployment.
 
 %package doc
 Summary:        Documentation for the OpenStack Integration Test Suite
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 

diff --git a/openstack/aodhclient/aodhclient.spec.j2 b/openstack/aodhclient/aodhclient.spec.j2
@@ -38,8 +38,8 @@ This is a client library for Aodh built on the Aodh API. It
 provides a Python API (the aodhclient module) and a command-line tool.
 
 %package doc
-Summary:        Documentation for OpenStack Aodh API Client
-Group:          Documentation
+Summary:        Documentation for the OpenStack Aodh API client
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 

diff --git a/openstack/automaton/automaton.spec.j2 b/openstack/automaton/automaton.spec.j2
@@ -2,7 +2,7 @@
 Name:           {{ py2name('automaton') }}
 Version:        1.12.0
 Release:        0
-Summary:        Friendly state machines for python
+Summary:        State machines for Python
 License:        {{ license('Apache-2.0') }}
 Group:          Development/Languages/Python
 Url:            https://launchpad.net/%{sname}
@@ -24,10 +24,11 @@ Requires:       {{ py2pkg('six') }}
 BuildArch:      noarch
 
 %description
-Friendly state machines for python.
+State machines for Python.
 
 %package doc
-Summary:        Documentation for the Automaton Library
+Summary:        Documentation for the Automaton library
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 

diff --git a/openstack/castellan/castellan.spec.j2 b/openstack/castellan/castellan.spec.j2
@@ -35,13 +35,13 @@ Generic Key Manager interface for OpenStack.
 
 %package doc
 Summary:        Documentation for castellan
-Group:          Documentation
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 
 %description doc
 Castellan is a generic Key Manager interface for OpenStack.
-This package contains the documentation
+This package contains the documentation.
 
 %prep
 %autosetup -n %{sname}-%{version}

diff --git a/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2 b/openstack/ceilometermiddleware/ceilometermiddleware.spec.j2
@@ -33,7 +33,7 @@ event data generation to be consumed by Ceilometer.
 
 %package doc
 Summary:        Documentation for %{name}
-Group:          Documentation
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 

diff --git a/openstack/cliff/cliff.spec.j2 b/openstack/cliff/cliff.spec.j2
@@ -36,7 +36,7 @@ setuptools entry points to provide subcommands, output formatters, and
 other extensions.
 
 %package doc
-Summary:        %{summary} - Documentation
+Summary:        Documentation for the Command Line Interface Formulation Framework
 Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}

diff --git a/openstack/debtcollector/debtcollector.spec.j2 b/openstack/debtcollector/debtcollector.spec.j2
@@ -35,7 +35,7 @@ future deprecations.
 
 %package doc
 Summary:        Documentation for %{name}
-Group:          Documentation
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 

diff --git a/openstack/django_openstack_auth/django_openstack_auth.spec.j2 b/openstack/django_openstack_auth/django_openstack_auth.spec.j2
@@ -38,7 +38,7 @@ user against OpenStack's Keystone Identity API.
 
 %package doc
 Summary:        Documentation for %{name}
-Group:          Documentation
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 

diff --git a/openstack/glance_store/glance_store.spec.j2 b/openstack/glance_store/glance_store.spec.j2
@@ -60,8 +60,8 @@ BuildArch:      noarch
 Glance store library.
 
 %package doc
-Summary:        Documentation for OpenStack Image Service Store Library
-Group:          Documentation
+Summary:        Documentation for the OpenStack Image Service Store library
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('reno') }}

diff --git a/openstack/gnocchiclient/gnocchiclient.spec.j2 b/openstack/gnocchiclient/gnocchiclient.spec.j2
@@ -42,8 +42,8 @@ This is a client library for Gnocchi built on the Gnocchi API. It
 provides a Python API (the gnocchiclient module) and a command-line tool.
 
 %package doc
-Summary:        Documentation for OpenStack Gnocchi API Client
-Group:          Documentation
+Summary:        Documentation for the OpenStack Gnocchi API client
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 

diff --git a/openstack/karbor/karbor.spec.j2 b/openstack/karbor/karbor.spec.j2
@@ -78,7 +78,7 @@ BuildRequires:  systemd
 %description
 Karbor is a Python implementation of the OpenStack
 (http://www.openstack.org) Application Data Protection API.
-.
+
 This package contains the karbor python libraries.
 
 %package -n     python-{{ pypi_name }}
@@ -130,15 +130,14 @@ This package contains the Karbor Python library.
 
 %if 0%{?with_doc}
 %package doc
-Summary:        Documentation for OpenStack Application Data Protection Service
-Group:          Documentation
+Summary:        Documentation for the OpenStack Application Data Protection Service
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description doc
-OpenStack Karbor documentaion.
-.
-This package contains the documentation
+Karbor is a Python implementation of the OpenStack Application Data Protection API.
+This package contains the Karbor Python library.
 %endif
 
 %package api

diff --git a/openstack/keystone/keystone.spec.j2 b/openstack/keystone/keystone.spec.j2
@@ -55,7 +55,7 @@ Requires(pre):  shadow-utils
 %description
 Keystone is a Python implementation of the OpenStack
 (http://www.openstack.org) identity service API.
-.
+
 This package contains the keystone python libraries.
 
 %package -n     python-{{ pypi_name }}
@@ -111,8 +111,8 @@ Keystone is a Python implementation of the OpenStack
 This package contains the Keystone Python library.
 
 %package doc
-Summary:        Documentation for OpenStack Identity Service
-Group:          Documentation
+Summary:        Documentation for the OpenStack Identity service
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('PasteDeploy') }}
 BuildRequires:  {{ py2pkg('Routes') }}
 BuildRequires:  {{ py2pkg('Sphinx') }}
@@ -136,9 +136,9 @@ BuildRequires:  {{ py2pkg('pysaml2') }}
 BuildRequires:  {{ py2pkg('python-memcached') }}
 
 %description doc
-OpenStack Keystone documentaion.
-.
-This package contains the documentation
+Keystone is a Python implementation of the OpenStack identity service API.
+
+This package contains the documentation.
 
 %prep
 %autosetup -p1 -n {{ pypi_name }}-{{upstream_version}}

diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2
@@ -48,6 +48,7 @@ Tools for authenticating to an OpenStack-based cloud. These tools include:
 
 %package doc
 Summary:        Documentation for OpenStack authenticating tools
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 

diff --git a/openstack/keystonemiddleware/keystonemiddleware.spec.j2 b/openstack/keystonemiddleware/keystonemiddleware.spec.j2
@@ -53,12 +53,13 @@ The most prominent module is keystonemiddleware.auth_token. This package
 does not expose any CLI or Python API features.
 
 %package doc
-Summary:        Documentation for Middleware for OpenStack Identity
+Summary:        Documentation for OpenStack Identity middleware
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 
 %description doc
-Documentation for Middleware for OpenStack Identity.
+Documentation for OpenStack Identity middleware.
 
 %prep
 %autosetup -p1 -n %{sname}-%{version}

diff --git a/openstack/masakari-monitors/masakari-monitors.spec.j2 b/openstack/masakari-monitors/masakari-monitors.spec.j2
@@ -65,7 +65,8 @@ System package - %{name}
 Python package - %{python_pkg}
 
 %package        doc
-Summary:        Documentation for OpenStack Masakari Service
+Summary:        Documentation for the OpenStack Masakari service
+Group:          Documentation/HTML
 BuildRequires:  git
 BuildRequires:  {{ py2pkg('Tempest') }}
 BuildRequires:  {{ py2pkg('Sphinx') }}

diff --git a/openstack/masakari/masakari.spec.j2 b/openstack/masakari/masakari.spec.j2
@@ -54,7 +54,8 @@ System package - %{name}
 Python package - python-%{sname}
 
 %package        doc
-Summary:        Documentation for OpenStack Masakari Service
+Summary:        Documentation for the OpenStack Masakari service
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Tempest') }}
 BuildRequires:  {{ py2pkg('WSME') }}
 BuildRequires:  {{ py2pkg('jsonschema') }}

diff --git a/openstack/microversion_parse/microversion_parse.spec.j2 b/openstack/microversion_parse/microversion_parse.spec.j2
@@ -19,11 +19,12 @@ A simple parser for OpenStack microversion headers.
 
 %package doc
 Summary:        Documentation for OpenStack Microversion headers
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description doc
-This package contains thedocumentation for OpenStack microversion
+This package contains the documentation for OpenStack microversion
 headers parsing library.
 
 %prep

diff --git a/openstack/mistral/mistral.spec.j2 b/openstack/mistral/mistral.spec.j2
@@ -82,7 +82,8 @@ System package - %{name}
 Python package - python-{{ pypi_name }}
 
 %package        doc
-Summary:        Documentation for OpenStack Workflow Service
+Summary:        Documentation for the OpenStack Workflow service
+Group:          Documentation/HTML
 BuildRequires:  git
 BuildRequires:  {{ py2pkg('Tempest') }}
 BuildRequires:  {{ py2pkg('Sphinx') }}
@@ -98,9 +99,7 @@ BuildRequires:  {{ py2pkg('sphinxcontrib-pecanwsme') }}
 BuildRequires:  {{ py2pkg('yaql') }}
 
 %description    doc
-OpenStack Mistral documentaion.
-.
-This package contains the documentation
+This package contains the documentation for OpenStack Mistral.
 
 %package -n     python-{{ pypi_name }}
 Summary:        Mistral Python libraries
@@ -166,16 +165,16 @@ Mistral is a workflow service.
 Most business processes consist of multiple distinct interconnected steps that need to be executed in a particular order
 in a distributed environment. One can describe such process as a set of tasks and task relations and upload such description
 to Mistral so that it takes care of state management, correct execution order, parallelism, synchronization and high availability.
-.
+
 This package contains the Python libraries.
 
 %package        api
 Summary:        OpenStack Mistral API service
 Requires:       %{name} = %{version}
 
 %description    api
-OpenStack rest API to the Mistral api.
-.
+OpenStack rest API to the Mistral API.
+
 This package contains the ReST API.
 
 %package        engine
@@ -184,7 +183,7 @@ Requires:       %{name} = %{version}
 
 %description    engine
 OpenStack Mistral Engine service.
-.
+
 This package contains the mistral engine, which is one of core services of mistral.
 
 %package        executor
@@ -193,7 +192,7 @@ Requires:       %{name} = %{version}
 
 %description    executor
 OpenStack Mistral Executor service.
-.
+
 This package contains the mistral executor, which is one of core services of mistral, and
 which the API servers will use.
 

diff --git a/openstack/mox3/mox3.spec.j2 b/openstack/mox3/mox3.spec.j2
@@ -27,7 +27,7 @@ enhancements have been made. The library was tested on Python version
 
 %package doc
 Summary:        Documentation for %{name}
-Group:          Documentation
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 

diff --git a/openstack/neutron-lib/neutron-lib.spec.j2 b/openstack/neutron-lib/neutron-lib.spec.j2
@@ -52,7 +52,7 @@ OpenStack Neutron library shared by all Neutron sub-projects.
 
 %package doc
 Summary:        OpenStack Neutron library documentation
-Group:          Documentation
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('reno') }}

diff --git a/openstack/neutron/neutron.spec.j2 b/openstack/neutron/neutron.spec.j2
@@ -226,15 +226,13 @@ SR-IOV network cards.
 
 %if 0%{?with_doc}
 %package doc
-Summary:        Documentation for OpenStack Networking Service
-Group:          Documentation
+Summary:        Documentation for the OpenStack Networking service
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description doc
-OpenStack Neutron documentaion.
-
-This package contains the documentation
+This package contains the documentation for OpenStack Neutron.
 %endif
 
 %prep

diff --git a/openstack/nova/nova.spec.j2 b/openstack/nova/nova.spec.j2
@@ -422,7 +422,7 @@ spice HTML5 console access service to Virtual Machines.
 %if 0%{?with_doc}
 %package doc
 Summary:        Documentation for OpenStack Compute
-Group:          Documentation
+Group:          Documentation/HTML
 BuildRequires:  graphviz
 BuildRequires:  {{ py2pkg('Babel') }}
 BuildRequires:  {{ py2pkg('MySQL-python') }}

diff --git a/openstack/openstack-macros/openstack-macros.spec.j2 b/openstack/openstack-macros/openstack-macros.spec.j2
@@ -4,9 +4,9 @@
 Name:           openstack-macros
 Version:        2018.1.0
 Release:        0
-Summary:        OpenStack Packaging - RPM Macros
+Summary:        RPM macros for OpenStack packaging
 License:        {{ license('Apache-2.0') }}
-Group:          Development/Libraries/Python
+Group:          Development/Tools/Other
 Url:            https://wiki.openstack.org/wiki/Rpm-packaging
 Source0:        macros.openstack-common
 Source1:        macros.openstack-suse

diff --git a/openstack/openstacksdk/openstacksdk.spec.j2 b/openstack/openstacksdk/openstacksdk.spec.j2
@@ -41,7 +41,7 @@ provide a consistent and complete set of interactions with OpenStack's
 many services, along with complete documentation, examples, and tools.
 
 %package doc
-Summary:        %{summary} - Documentation
+Summary:        Documentation for the OpenStack SDK
 Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('keystoneauth1') }}

diff --git a/openstack/os-apply-config/os-apply-config.spec.j2 b/openstack/os-apply-config/os-apply-config.spec.j2
@@ -30,10 +30,11 @@ BuildRequires:  {{ py2pkg('testtools') }}
 %endif
 
 %description
-os-apply-config is a apply configuration from cloud metadata
+os-apply-config applies configuration from cloud metadata.
 
 %package doc
-Summary:        Documentation for OpenStack Os-apply-config configuration library
+Summary:        Documentation for the OpenStack Os-apply-config configuration library
+Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 BuildRequires:  {{ py2pkg('reno') }}