openstack/rpm-packaging
Code Issues Proposed changes

Merge "Build fixes"

Browse Source
This commit is contained in:
Zuul
2025-07-18 23:17:40 +00:00
committed by Gerrit Code Review
parent 1f66e74178 58dffbf144
commit 0a77fe4a7d
5 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openstack/mistral-lib/mistral-lib.spec.j2
View File

@@ -1,6 +1,5 @@
{% set pypi_name = 'mistral-lib' %}
{% set upstream_version = upstream_version('3.3.1') %}
{% set source = url_pypi() %}
{% set rpm_release = '1' %}
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
@@ -9,7 +8,7 @@ Summary: Mistral shared routings and utilities
License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/{{ pypi_name }}
Source0: {{ source }}
Source0: https://files.pythonhosted.org/packages/source/m/{{ pypi_name }}/mistral_lib-{{ upstream_version }}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('oslo.log') }}
@@ -47,7 +46,7 @@ This library also contains the public interfaces for 3rd party integration
This package contains the Python 3.x module.
%prep
%autosetup -p1 -n {{ pypi_name }}-%{version}
%autosetup -p1 -n mistral_lib-%{version}
%py_req_cleanup
%build

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

@@ -1,7 +1,6 @@
{% set pypi_name = 'os-brick' %}
{% set upstream_version = upstream_version('6.11.0') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
# NOTE(ykarel): This is required to prevent singlespec macros from changing the requires
%global oldpython python
Name: {{ py2name() }}
@@ -11,7 +10,7 @@ Summary: OpenStack Cinder brick library for managing local volume attache
License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/{{ pypi_name }}
Source0: {{ source }}
Source0: https://files.pythonhosted.org/packages/source/o/os-brick/os_brick-{{ upstream_version }}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py3('Babel') }}
BuildRequires: {{ py3('castellan') }}
@@ -86,7 +85,7 @@ Summary: Common files for the OpenStack Cinder brick library
Configuration files for the OpenStack Cinder brick library.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%autosetup -p1 -n os_brick-{{ upstream_version }}
%py_req_cleanup
%build

5
openstack/os-ken/os-ken.spec.j2
View File

@@ -1,7 +1,6 @@
{% set pypi_name = 'os-ken' %}
{% set upstream_version = upstream_version('3.0.1') %}
{% set rpm_release = '0' %}
{% set source = url_pypi() %}
Name: {{ py2name('os-ken') }}
Epoch: {{ epoch('os-ken') }}
Version: {{ py2rpmversion() }}
@@ -10,7 +9,7 @@ Summary: A component-based software defined networking framework in OpenS
License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/{{ pypi_name }}
Source0: {{ source }}
Source0: https://files.pythonhosted.org/packages/source/o/{{ pypi_name }}/os_ken-{{ upstream_version }}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py3('Routes') }}
BuildRequires: {{ py3('WebOb') }}
@@ -61,7 +60,7 @@ This is a fork of the Ryu library tailored for OpenStack Neutron.
This package contains the documentation.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%autosetup -p1 -n os_ken-{{ upstream_version }}
%py_req_cleanup
%build

32
openstack/oslo.reports/0001-Handle-shell_completion-option-in-test-suite.patch
View File

@@ -1,32 +0,0 @@
From a25f36fa6620ee3f90a37599e41dac311a49c452 Mon Sep 17 00:00:00 2001
From: Joel Capitao <jcapitao@redhat.com>
Date: Mon, 2 Sep 2024 16:13:17 +0200
Subject: [PATCH] Handle shell_completion option in test suite
Since [1], oslo.config has added option to generate shell
completion. This patch adapts unit tests to handle it.
[1] https://review.opendev.org/c/openstack/oslo.config/+/906478
Change-Id: I167d7e552194b87edff8d6b6de9e721e091bfd36
---
oslo_reports/tests/test_openstack_generators.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/oslo_reports/tests/test_openstack_generators.py b/oslo_reports/tests/test_openstack_generators.py
index 3cb0378..9bda519 100644
--- a/oslo_reports/tests/test_openstack_generators.py
+++ b/oslo_reports/tests/test_openstack_generators.py
@@ -112,7 +112,8 @@ class TestOpenstackGenerators(base.BaseTestCase):
'default: \n'
'%s'
' crackers = triscuit\n'
- ' secrets = ***') % config_source_line
+ ' secrets = ***\n'
+ ' shell_completion = None') % config_source_line
self.assertEqual(target_str, str(model))
def test_package_report_generator(self):
--
2.46.0

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

@@ -10,8 +10,6 @@ License: Apache-2.0
Group: Development/Languages/Python
URL: https://docs.openstack.org/{{ pypi_name }}
Source0: https://files.pythonhosted.org/packages/source/o/oslo-reports/oslo_reports-{{ upstream_version }}.tar.gz
# https://review.opendev.org/c/openstack/oslo.reports/+/927739
Patch1: 0001-Handle-shell_completion-option-in-test-suite.patch
BuildRequires: openstack-macros
BuildRequires: {{ py3('Jinja2') }}
BuildRequires: {{ py3('eventlet') }}