diff --git a/_service b/_service
deleted file mode 100644
index 79e9b33..0000000
--- a/_service
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- https://opendev.org/openstack/rpm-packaging/raw/master/openstack/python-cinderclient/python-cinderclient.spec.j2
- python-cinderclient.spec
- https://opendev.org/openstack/python-cinderclient/raw/master/requirements.txt
- cloud-devel@suse.de
- gh,openstack,python-cinderclient
-
-
-
-
-
diff --git a/python-cinderclient.changes b/python-cinderclient.changes
index eaf8e7d..5d3cad7 100644
--- a/python-cinderclient.changes
+++ b/python-cinderclient.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Nov 9 12:50:43 UTC 2025 - Dirk Müller
+
+- update to 9.8.0:
+ * Fix talking to older servers
+ * Remove Python 3.9 support
+ * Remove tags from README
+ * Update python versions for testing
+ * Update master for stable/2025.1
+
-------------------------------------------------------------------
Tue Jul 1 22:45:57 UTC 2025 - Dirk Müller
diff --git a/python-cinderclient.spec b/python-cinderclient.spec
index 36e2186..e06e13e 100644
--- a/python-cinderclient.spec
+++ b/python-cinderclient.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-cinderclient
#
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,52 +16,42 @@
#
+%global pythons %{primary_python}
Name: python-cinderclient
-Version: 9.7.0
+Version: 9.8.0
Release: 0
Summary: Python API and CLI for OpenStack Cinder
License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/python-cinderclient
-Source0: https://files.pythonhosted.org/packages/source/p/python-cinderclient/python_cinderclient-9.7.0.tar.gz
+Source0: https://files.pythonhosted.org/packages/source/p/python-cinderclient/python_cinderclient-%{version}.tar.gz
+BuildRequires: %{python_module PrettyTable >= 0.7.2}
+BuildRequires: %{python_module ddt}
+BuildRequires: %{python_module fixtures}
+BuildRequires: %{python_module keystoneauth1 >= 5.9.0}
+BuildRequires: %{python_module oslo.serialization}
+BuildRequires: %{python_module oslo.utils >= 4.8.0}
+BuildRequires: %{python_module pip}
+BuildRequires: %{python_module requests >= 2.25.1}
+BuildRequires: %{python_module requests-mock}
+BuildRequires: %{python_module stestr}
+BuildRequires: %{python_module testtools}
+BuildRequires: %{python_module wheel}
BuildRequires: openstack-macros
-BuildRequires: python3-PrettyTable >= 0.7.2
-BuildRequires: python3-ddt
-BuildRequires: python3-fixtures
-BuildRequires: python3-keystoneauth1 >= 5.9.0
-BuildRequires: python3-oslo.serialization
-BuildRequires: python3-oslo.utils >= 4.8.0
-BuildRequires: python3-pbr >= 5.5.0
-BuildRequires: python3-requests >= 2.25.1
-BuildRequires: python3-requests-mock
-BuildRequires: python3-stestr
-BuildRequires: python3-testtools
+Requires: python-Babel
+Requires: python-PrettyTable >= 0.7.2
+Requires: python-keystoneauth1 >= 5.9.0
+Requires: python-oslo.i18n >= 5.0.1
+Requires: python-oslo.utils >= 4.8.0
+Requires: python-requests >= 2.25.1
BuildArch: noarch
+%python_subpackages
%description
This is a client for the OpenStack Cinder API (Block Storage. There's a
Python API (the cinderclient module), and a command-line script (cinder).
Each implements 100% of the OpenStack Cinder API.
-%package -n python3-cinderclient
-Summary: Python API and CLI for OpenStack Cinder
-Requires: python3-Babel
-Requires: python3-PrettyTable >= 0.7.2
-Requires: python3-keystoneauth1 >= 5.9.0
-Requires: python3-oslo.i18n >= 5.0.1
-Requires: python3-oslo.utils >= 4.8.0
-Requires: python3-requests >= 2.25.1
-%if 0%{?suse_version}
-Obsoletes: python2-cinderclient < 6.0.0
-%endif
-
-%description -n python3-cinderclient
-This is a client for the OpenStack Cinder API (Block Storage. There's a
-Python API (the cinderclient module), and a command-line script (cinder).
-Each implements 100% of the OpenStack Cinder API.
-
-This package contains the Python 3.x module.
-
%package -n python-cinderclient-doc
Summary: Documentation for OpenStack Cinder API Client
Group: Documentation/HTML
@@ -76,20 +66,20 @@ Each implements 100% of the OpenStack Cinder API.
This package contains auto-generated documentation.
%prep
-%autosetup -p1 -n python_cinderclient-9.7.0
-%py_req_cleanup
+%autosetup -p1 -n python_cinderclient-%{version}
%build
-%{py3_build}
+%pyproject_wheel
export PYTHONPATH=.
-PBR_VERSION=9.7.0 %sphinx_build -b html doc/source doc/build/html
-PBR_VERSION=9.7.0 %sphinx_build -b man doc/source doc/build/man
+PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html
+PBR_VERSION=%{version} %sphinx_build -b man doc/source doc/build/man
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
-%{py3_install}
+%pyproject_install
+
# man page
install -p -D -m 644 doc/build/man/cinder.1 %{buildroot}%{_mandir}/man1/cinder.1
# bash completion
@@ -99,11 +89,11 @@ install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bas
rm cinderclient/tests/unit/test_shell.py
%{openstack_stestr_run}
-%files -n python3-cinderclient
+%files %{python_files}
%license LICENSE
%doc README.rst ChangeLog
-%{python3_sitelib}/cinderclient
-%{python3_sitelib}/*.egg-info
+%{python_sitelib}/cinderclient
+%{python_sitelib}/python_cinderclient-%{version}.dist-info
%{_bindir}/cinder
%{_mandir}/man1/cinder.1*
%{_sysconfdir}/bash_completion.d/cinder.bash_completion
diff --git a/python_cinderclient-9.7.0.tar.gz b/python_cinderclient-9.7.0.tar.gz
deleted file mode 100644
index 592b946..0000000
--- a/python_cinderclient-9.7.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18c4501e549677984d85b0b10fd074efbd265e30add2a796d28176055a8d7dcf
-size 236901
diff --git a/python_cinderclient-9.8.0.tar.gz b/python_cinderclient-9.8.0.tar.gz
new file mode 100644
index 0000000..3ecad0d
--- /dev/null
+++ b/python_cinderclient-9.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd3ee9f9487c5e79957f018a6b3f2dece7059dad8f6155d83dd4b6eb9447a11d
+size 237057