diff --git a/openstack-swift.spec b/openstack-swift.spec index dd1d66e693683eae38e3b9f7a6e3de44aa7fb90f..60e3a344de671fa01365f6b5fd54bd692c7319fe 100644 --- a/openstack-swift.spec +++ b/openstack-swift.spec @@ -14,7 +14,7 @@ inexpensive commodity hard drives and servers can be used in lieu of more \ expensive equipment. Name: openstack-swift -Version: 2.29.1 +Version: 2.31.1 Release: 1 Summary: OpenStack Object Storage License: ASL 2.0 @@ -72,6 +72,8 @@ BuildRequires: openstack-macros BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pbr +BuildRequires: python3-wheel +BuildRequires: python3-idna BuildRequires: git-core BuildRequires: /usr/bin/pathfix.py @@ -161,6 +163,7 @@ Requires: python3-paste-deploy >= 1.3.3 Requires: python3-xattr >= 0.4 Requires: python3-netifaces >= 0.8 Requires: python3-lxml >= 3.4.1 +Requires: python3-idna %{?systemd_ordering} @@ -186,9 +189,12 @@ This package contains the %{name} test files. %package doc Summary: Documentation for %{name} -BuildRequires: python3-sphinx >= 1.0 -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-sphinxcontrib-svg2pdfconverter +BuildRequires: python3-sphinx > 2.1.0 +BuildRequires: python3-openstackdocstheme >= 2.2.1 +BuildRequires: python3-sphinxcontrib-svg2pdfconverter >= 0.1.0 +BuildRequires: python3-reno >= 3.1.0 +BuildRequires: python3-os-api-ref >= 1.0.0 +BuildRequires: python3-keystoneclient > 2.1.0 # Required for generating docs (otherwise py-modindex.html is missing) BuildRequires: python3-eventlet BuildRequires: python3-pyeclib @@ -197,6 +203,7 @@ BuildRequires: python3-netifaces BuildRequires: python3-paste-deploy BuildRequires: python3-xattr BuildRequires: python3-lxml +BuildRequires: python3-idna %description doc %{common_desc} @@ -221,8 +228,12 @@ This package contains documentation files for %{name}. # Fails unless we create the build directory mkdir -p doc/build # Build docs -export PYTHONPATH=. - +CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}" \ +PATH="%{buildroot}%{_bindir}:$PATH" \ +PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}" \ +PYTHONDONTWRITEBYTECODE=1 \ +%{?__pytest_addopts:PYTEST_ADDOPTS="${PYTEST_ADDOPTS:-} %{__pytest_addopts}"} \ +PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus} \ sphinx-build -b html doc/source doc/build/html # Fix hidden-file-or-dir warning rm -rf doc/build/html/.{doctrees,buildinfo} @@ -579,6 +590,9 @@ exit 0 %endif %changelog +* Thu Apr 18 2024 Dongxing Wang - 2.31.1-1 +- Upgrade with version 2.31.1 to support OpenStack-Antelope + * Thu Jun 16 2022 OpenStack_SIG - 2.29.1-1 - Upgrade version for openstack yoga diff --git a/swift-2.29.1.tar.gz b/swift-2.31.1.tar.gz similarity index 34% rename from swift-2.29.1.tar.gz rename to swift-2.31.1.tar.gz index ab2bb63403c4110e410a2938f343781fee0b88f5..54e45f9d8e8773b66ee4e2f678a7a2c9c523604c 100644 Binary files a/swift-2.29.1.tar.gz and b/swift-2.31.1.tar.gz differ