| |
@@ -1,10 +1,6 @@
|
| |
%global pypi_name os-service-types
|
| |
%global module_name os_service_types
|
| |
|
| |
- %if 0%{?fedora}
|
| |
- %global with_python3 1
|
| |
- %endif
|
| |
-
|
| |
%global common_desc \
|
| |
OsServiceTypes is a Python library for consuming OpenStack \
|
| |
sevice-types-authority data. \
|
| |
@@ -17,7 +13,7 @@
|
| |
|
| |
Name: python-%{pypi_name}
|
| |
Version: 1.1.0
|
| |
- Release: 8%{?dist}
|
| |
+ Release: 9%{?dist}
|
| |
Summary: Python library for consuming OpenStack sevice-types-authority data
|
| |
|
| |
License: ASL 2.0
|
| |
@@ -30,24 +26,6 @@
|
| |
%description
|
| |
%{common_desc}
|
| |
|
| |
- %package -n python2-%{pypi_name}
|
| |
- Summary: %{summary}
|
| |
- %{?python_provide:%python_provide python2-%{pypi_name}}
|
| |
-
|
| |
- BuildRequires: python2-devel
|
| |
- BuildRequires: python2-pbr
|
| |
- BuildRequires: python2-subunit
|
| |
- BuildRequires: python2-oslotest
|
| |
- BuildRequires: python2-testscenarios
|
| |
- BuildRequires: python2-requests-mock
|
| |
- BuildRequires: python2-keystoneauth1
|
| |
- BuildRequires: python2-setuptools
|
| |
-
|
| |
- Requires: python2-pbr >= 2.0.0
|
| |
- %description -n python2-%{pypi_name}
|
| |
- %{common_desc}
|
| |
-
|
| |
- %if 0%{?with_python3}
|
| |
%package -n python3-%{pypi_name}
|
| |
Summary: %{summary}
|
| |
%{?python_provide:%python_provide python3-%{pypi_name}}
|
| |
@@ -64,18 +42,16 @@
|
| |
Requires: python3-pbr >= 2.0.0
|
| |
%description -n python3-%{pypi_name}
|
| |
%{common_desc}
|
| |
- %endif
|
| |
|
| |
%package -n python-%{pypi_name}-doc
|
| |
Summary: %{pypi_name} documentation
|
| |
|
| |
- BuildRequires: python2-openstackdocstheme
|
| |
- BuildRequires: python2-sphinx
|
| |
+ BuildRequires: python3-openstackdocstheme
|
| |
+ BuildRequires: python3-sphinx
|
| |
|
| |
%description -n python-%{pypi_name}-doc
|
| |
%{common_desc}
|
| |
|
| |
-
|
| |
Documentation for %{pypi_name}
|
| |
|
| |
%prep
|
| |
@@ -84,49 +60,33 @@
|
| |
rm -rf %{pypi_name}.egg-info
|
| |
|
| |
%build
|
| |
- %if 0%{?with_python3}
|
| |
%py3_build
|
| |
- %endif
|
| |
- %py2_build
|
| |
# generate html docs
|
| |
- %{__python2} setup.py build_sphinx -b html
|
| |
+ %{__python3} setup.py build_sphinx -b html
|
| |
# remove the sphinx-build leftovers
|
| |
rm -rf doc/build/html/.{doctrees,buildinfo}
|
| |
|
| |
%install
|
| |
- %if 0%{?with_python3}
|
| |
%py3_install
|
| |
- %endif
|
| |
-
|
| |
- %py2_install
|
| |
-
|
| |
|
| |
%check
|
| |
- %if 0%{?with_python3}
|
| |
+ export PYTHON=%{__python3}
|
| |
%{__python3} setup.py test
|
| |
- %endif
|
| |
-
|
| |
- %{__python2} setup.py test
|
| |
-
|
| |
- %files -n python2-%{pypi_name}
|
| |
- %license LICENSE
|
| |
- %doc README.rst doc/source/readme.rst
|
| |
- %{python2_sitelib}/%{module_name}
|
| |
- %{python2_sitelib}/%{module_name}-%{version}-py?.?.egg-info
|
| |
|
| |
- %if 0%{?with_python3}
|
| |
%files -n python3-%{pypi_name}
|
| |
%license LICENSE
|
| |
%doc README.rst doc/source/readme.rst
|
| |
%{python3_sitelib}/%{module_name}
|
| |
%{python3_sitelib}/%{module_name}-%{version}-py?.?.egg-info
|
| |
- %endif
|
| |
|
| |
%files -n python-%{pypi_name}-doc
|
| |
%license LICENSE
|
| |
%doc doc/build/html
|
| |
|
| |
%changelog
|
| |
+ * Mon Feb 04 2019 Yatin Karel <ykarel@redhat.com> - 1.1.0-9
|
| |
+ - Remove python2 sub package (#1671990)
|
| |
+
|
| |
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-8
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
| |
|
| |
