openstack
/
rpm-packaging
Code Issues Proposed changes

Fixup dependencies 

Change-Id: Ied2aba3ae0aa056ed6dd0283ebcb9fecd371b1e0
This commit is contained in:
Dirk Müller 2024-01-04 11:10:13 +01:00
parent 54c4da5f7e
commit b0d93dba15
No known key found for this signature in database
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/os-brick/os-brick.spec.j2
View File

@ -1,5 +1,5 @@
{% set pypi_name = 'os-brick' %}
{% set upstream_version = upstream_version('6.1.0') %}
{% set upstream_version = upstream_version('6.5.0') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
# NOTE(ykarel): This is required to prevent singlespec macros from changing the requires
@ -102,6 +102,8 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
mv %{buildroot}%{_prefix}%{_sysconfdir}/* %{buildroot}/%{_sysconfdir}/
%check
# Requires os-win
rm -rf os_brick/tests/windows os_brick/tests/remotefs/test_windows*.py
%{openstack_stestr_run} --concurrency=1
%files -n {{ py2name(py_versions='py3') }}

4
openstack/osc-lib/osc-lib.spec.j2
View File

@ -21,9 +21,9 @@ BuildRequires: {{ py3('oslo.utils') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('osprofiler') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('platformdirs') }}
BuildRequires: {{ py3('requests-mock') }}
BuildRequires: {{ py3('simplejson') }}
BuildRequires: {{ py3('six') }}
BuildRequires: {{ py3('stestr') }}
BuildRequires: {{ py3('stevedore') }}
BuildRequires: {{ py3('testtools') }}
@ -41,8 +41,8 @@ Requires: {{ py3('openstacksdk') }}
Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('pbr') }}
Requires: {{ py3('platformdirs') }}
Requires: {{ py3('simplejson') }}
Requires: {{ py3('six') }}
Requires: {{ py3('stevedore') }}
%description -n {{ py2name(py_versions='py3') }}

2
openstack/oslo.limit/oslo.limit.spec.j2
View File

@ -19,6 +19,7 @@ BuildRequires: {{ py3('oslo.i18n') }}
BuildRequires: {{ py3('oslo.log') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('platformdirs') }}
BuildRequires: {{ py3('stestr') }}
BuildArch: noarch
@ -33,6 +34,7 @@ Requires: {{ py3('openstacksdk') }}
Requires: {{ py3('oslo.config') }}
Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.log') }}
Requires: {{ py3('platformdirs') }}
%description -n {{ py2name(py_versions='py3') }}
Oslo.limit is the limit enforcement library to assist with quota calculation.

1
openstack/oslo.log/oslo.log.spec.j2
View File

@ -13,6 +13,7 @@ URL: https://docs.openstack.org/{{ pypi_name }}
Source0: {{ source }}
BuildRequires: fdupes
BuildRequires: openstack-macros
BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('monotonic') }}
BuildRequires: {{ py3('oslo.config') }}
BuildRequires: {{ py3('oslo.context') }}

2
openstack/sushy-tools/sushy-tools.spec.j2
View File

@ -22,7 +22,9 @@ BuildRequires: {{ py3('setuptools') }}
BuildRequires: {{ py3('tenacity') }}
BuildArch: noarch
%if 0%{?suse_version}
BuildRequires: shadow
BuildRequires: systemd-rpm-macros
Requires(pre): shadow
%{?systemd_requires}
%else
BuildRequires: systemd