commit abb6522c52320acb306f6a04d2bf67ddf84886ce
Author: Jakub Bogusz <[email protected]>
Date:   Sat Jan 20 14:25:17 2024 +0100

    - updated to 7.0.0

 python-oslo.config.spec | 119 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 89 insertions(+), 30 deletions(-)
---
diff --git a/python-oslo.config.spec b/python-oslo.config.spec
index 3fea0de..387f983 100644
--- a/python-oslo.config.spec
+++ b/python-oslo.config.spec
@@ -1,36 +1,80 @@
 #
 # Conditional build:
-%bcond_with    doc     # do build doc (missing deps)
-%bcond_with    tests   # do perform "make test" (missing deps)
+%bcond_without doc     # Sphinx documentation
+%bcond_with    tests   # unit tests (incomplete dependencies)
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
 Summary:       Oslo Configuration API
+Summary(pl.UTF-8):     API do konfiguracji Oslo
 Name:          python-oslo.config
-Version:       4.11.0
-Release:       7
-License:       Apache
+# keep 7.x here for python2 support
+Version:       7.0.0
+Release:       1
+License:       Apache v2.0
 Group:         Libraries/Python
 Source0:       
https://files.pythonhosted.org/packages/source/o/oslo.config/oslo.config-%{version}.tar.gz
-# Source0-md5: 144c11b78b24c3d7393e23c5eaf2fedf
-URL:           https://pypi.python.org/pypi/oslo.config
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.714
+# Source0-md5: b065afbe51bac25fa8981d9da1ca782c
+URL:           https://pypi.org/project/oslo.config/
 %if %{with python2}
+BuildRequires: python-modules >= 1:2.7
 BuildRequires: python-pbr >= 2.0.0
 BuildRequires: python-setuptools
+%if %{with tests}
+BuildRequires: python-PyYAML >= 3.12
+BuildRequires: python-debtcollector >= 1.2.0
+BuildRequires: python-enum34 >= 1.0.4
+BuildRequires: python-fixtures >= 3.0.0
+BuildRequires: python-mock >= 3.0.0
+BuildRequires: python-netaddr >= 0.7.18
+BuildRequires: python-oslo.i18n >= 3.15.3
+BuildRequires: python-oslo.log >= 3.36.0
+BuildRequires: python-oslotest >= 3.2.0
+BuildRequires: python-requests >= 2.18.0
+BuildRequires: python-requests-mock >= 1.5.0
+BuildRequires: python-rfc3986 >= 1.2.0
+BuildRequires: python-six >= 1.10.0
+BuildRequires: python-stestr >= 2.1.0
+BuildRequires: python-stevedore >= 1.20.0
+BuildRequires: python-testscenarios >= 0.4
+BuildRequires: python-testtools >= 2.2.0
+%endif
 %endif
 %if %{with python3}
+BuildRequires: python3-modules >= 1:3.6
 BuildRequires: python3-pbr >= 2.0.0
 BuildRequires: python3-setuptools
+%if %{with tests}
+BuildRequires: python3-PyYAML >= 3.12
+BuildRequires: python3-debtcollector >= 1.2.0
+BuildRequires: python3-fixtures >= 3.0.0
+BuildRequires: python3-mock >= 3.0.0
+BuildRequires: python3-netaddr >= 0.7.18
+BuildRequires: python3-oslo.i18n >= 3.15.3
+BuildRequires: python3-oslo.log >= 3.36.0
+BuildRequires: python3-oslotest >= 3.2.0
+BuildRequires: python3-requests >= 2.18.0
+BuildRequires: python3-requests-mock >= 1.5.0
+BuildRequires: python3-rfc3986 >= 1.2.0
+BuildRequires: python3-six >= 1.10.0
+BuildRequires: python3-stestr >= 2.1.0
+BuildRequires: python3-stevedore >= 1.20.0
+BuildRequires: python3-testscenarios >= 0.4
+BuildRequires: python3-testtools >= 2.2.0
+%endif
 %endif
-Requires:      python-PyYAML >= 3.10.0
-Requires:      python-debtcollector >= 1.2.0
-Requires:      python-netaddr >= 0.7.13
-Requires:      python-oslo.i18n >= 2.1.0
-Requires:      python-rfc3986 >= 0.3.1
-Requires:      python-six >= 1.9.0
-Requires:      python-stevedore >= 1.20.0
+%if %{with doc}
+BuildRequires: python-debtcollector >= 1.2.0
+BuildRequires: python-netaddr >= 0.7.18
+BuildRequires: python-openstackdocstheme >= 1.20.0
+BuildRequires: python-oslo.i18n >= 3.15.3
+BuildRequires: python-reno >= 2.5.0
+BuildRequires: python-rfc3986 >= 1.2.0
+BuildRequires: python-sphinxcontrib-apidoc >= 0.2.0
+BuildRequires: sphinx-pdg-2 >= 1.8.0
+%endif
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.714
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,21 +82,23 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 The Oslo configuration API supports parsing command line arguments and
 .ini style configuration files.
 
+%description -l pl.UTF-8
+API konfiguracyjne Oslo obsługuje analizę argumentów linii poleceń
+oraz plików konfiguracyjnych w stylu .ini.
+
 %package -n python3-oslo.config
 Summary:       Oslo Configuration API
+Summary(pl.UTF-8):     API do konfiguracji Oslo
 Group:         Libraries/Python
-Requires:      python3-PyYAML >= 3.10.0
-Requires:      python3-debtcollector >= 1.2.0
-Requires:      python3-netaddr >= 0.7.13
-Requires:      python3-oslo.i18n >= 2.1.0
-Requires:      python3-rfc3986 >= 0.3.1
-Requires:      python3-six >= 1.9.0
-Requires:      python3-stevedore >= 1.20.0
 
 %description -n python3-oslo.config
 The Oslo configuration API supports parsing command line arguments and
 .ini style configuration files.
 
+%description -n python3-oslo.config -l pl.UTF-8
+API konfiguracyjne Oslo obsługuje analizę argumentów linii poleceń
+oraz plików konfiguracyjnych w stylu .ini.
+
 %package apidocs
 Summary:       API documentation for Python oslo.config module
 Summary(pl.UTF-8):     Dokumentacja API modułu Pythona oslo.config
@@ -77,9 +123,8 @@ Dokumentacja API modułu Pythona oslo.config.
 %endif
 
 %if %{with doc}
-cd doc
-%{__make} -j1 html
-rm -rf _build/html/_sources
+PYTHONPATH=$(pwd) \
+sphinx-build-2 -b html doc/source doc/build/html
 %endif
 
 %install
@@ -89,10 +134,22 @@ rm -rf $RPM_BUILD_ROOT
 %py_install
 
 %py_postclean
+
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/oslo-config-generator{,-2}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/oslo-config-validator{,-2}
+
+%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/oslo_config/tests
 %endif
 
 %if %{with python3}
 %py3_install
+
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/oslo-config-generator{,-3}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/oslo-config-validator{,-3}
+ln -sf /oslo-config-validator-3 $RPM_BUILD_ROOT%{_bindir}/oslo-config-generator
+ln -sf /oslo-config-validator-3 $RPM_BUILD_ROOT%{_bindir}/oslo-config-validator
+
+%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/oslo_config/tests
 %endif
 
 %clean
@@ -102,11 +159,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README.rst
+%attr(755,root,root) %{_bindir}/oslo-config-generator-2
+%attr(755,root,root) %{_bindir}/oslo-config-validator-2
 %{py_sitescriptdir}/oslo_config
 %{py_sitescriptdir}/oslo.config-%{version}-py*.egg-info
-%if %{without python3}
-%attr(755,root,root) %{_bindir}/oslo-config-generator
-%endif
 %endif
 
 %if %{with python3}
@@ -114,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README.rst
 %attr(755,root,root) %{_bindir}/oslo-config-generator
+%attr(755,root,root) %{_bindir}/oslo-config-generator-3
+%attr(755,root,root) %{_bindir}/oslo-config-validator
+%attr(755,root,root) %{_bindir}/oslo-config-validator-3
 %{py3_sitescriptdir}/oslo_config
 %{py3_sitescriptdir}/oslo.config-%{version}-py*.egg-info
 %endif
@@ -121,5 +180,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with doc}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/_build/html/*
+%doc 
doc/build/html/{_static,cli,configuration,contributor,reference,*.html,*.js}
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-oslo.config.git/commitdiff/abb6522c52320acb306f6a04d2bf67ddf84886ce

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to