diff --git a/os-client-config-1.31.2.tar.gz b/os-client-config-1.31.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8b48e9490a05d243ae72b5c6fe75953cf268f0de Binary files /dev/null and b/os-client-config-1.31.2.tar.gz differ diff --git a/os-client-config-2.1.0.tar.gz b/os-client-config-2.1.0.tar.gz deleted file mode 100644 index 17bf04b5a5231a50be52b776c6978ff31e28cf38..0000000000000000000000000000000000000000 Binary files a/os-client-config-2.1.0.tar.gz and /dev/null differ diff --git a/python-os-client-config.spec b/python-os-client-config.spec index bea0c3af246b28b9d558d750a20c18972ee59832..bf71d07dc35965066c3be199537fbf5b253ef2a8 100644 --- a/python-os-client-config.spec +++ b/python-os-client-config.spec @@ -1,97 +1,78 @@ %global _empty_manifest_terminate_build 0 -%global with_doc 1 +Name: python-os-client-config +Version: 1.31.2 +Release: 1 +Summary: OpenStack Client Configuation Library +License: Apache-2.0 +URL: https://docs.openstack.org/os-client-config/latest +Source0: https://files.pythonhosted.org/packages/80/bb/e7d5c7ae06ccbab1c9a3f8b9ea2a99d16981b66b5f2cad21f1b94a0eca0e/os-client-config-1.31.2.tar.gz +BuildArch: noarch - -Name: python-os-client-config -Version: 2.1.0 -Release: 1%{?dist} -Summary: OpenStack Client Configuration Library -License: Apache-2.0 -URL: https://github.com/openstack/os-client-config -Source0: https://pypi.io/packages/source/o/os-client-config/os-client-config-2.1.0.tar.gz -BuildArch: noarch -BuildRequires: git +Requires: python2-openstacksdk %description -The os-client-config is a library for collecting client configuration for \ -using an OpenStack cloud in a consistent and comprehensive manner. It \ -will find cloud config for as few as 1 cloud and as many as you want to \ -put in a config file. It will read environment variables and config files, \ -and it also contains some vendor specific default values so that you don't \ -have to know extra info to use OpenStack - - -%package -n python3-os-client-config -Summary: Library for collecting client configuration of OpenStack -%{?python_provide:%python_provide python3-os-client-config} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-pip -BuildRequires: python3-fixtures -BuildRequires: python3-stestr -BuildRequires: python3-glanceclient >= 0.18.0 -BuildRequires: python3-openstacksdk -BuildRequires: python3-oslotest >= 1.10.0 -BuildRequires: python3-jsonschema >= 2.6.0 -Requires: python3-openstacksdk >= 0.13.0 - -%description -n python3-os-client-config +%package -n python2-os-client-config +Summary: OpenStack Client Configuation Library +Provides: python2-os-client-config +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pbr +%description -n python2-os-client-config The os-client-config is a library for collecting client configuration for \ using an OpenStack cloud in a consistent and comprehensive manner. It \ will find cloud config for as few as 1 cloud and as many as you want to \ put in a config file. It will read environment variables and config files, \ and it also contains some vendor specific default values so that you don't \ -have to know extra info to use OpenStack - +have to know extra info to use OpenStack \ -%if 0%{?with_doc} -%package -n python-os-client-config-doc -Summary: Documentation for OpenStack os-client-config library +%package help +Summary: Development documents and examples for os-client-config +Provides: python2-os-client-config-doc +%description help -BuildRequires: python3-sphinx -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-reno - -%description -n python-os-client-config-doc -Documentation for the os-client-config library. -%endif %prep -%autosetup -n os-client-config-2.1.0 -S git -rm -f test-requirements.txt requirements.txt +%autosetup -n os-client-config-1.31.2 %build -%{py3_build} - -%if 0%{?with_doc} -sphinx-build-3 -b html doc/source/ doc/build/html -rm -rf doc/build/html/.{doctrees,buildinfo} doc/build/html/objects.inv -%endif +%py2_build %install -%{py3_install} - -%check -export OS_TEST_PATH='./os_client_config/tests' -export PATH=$PATH:$RPM_BUILD_ROOT/usr/bin -export PYTHONPATH=$PWD - - -%files -n python3-os-client-config -%doc ChangeLog CONTRIBUTING.rst PKG-INFO README.rst -%license LICENSE -%{python3_sitelib}/os_client_config -%{python3_sitelib}/*.egg-info - -%if 0%{?with_doc} -%files -n python-os-client-config-doc -%license LICENSE -%doc doc/build/html -%endif +%py2_install +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . + +%files -n python2-os-client-config -f filelist.lst +%dir %{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Thu Jan 13 2021 Python_Bot +* Wed Jun 02 2021 openstack-sig - Package Spec generated