openstack/rpm-packaging
Code Issues Proposed changes

Add conflicts with the non-singlespeced packages

Browse Source 
In order to make seamless upgrade possible we need to explicitly
declare the conflict with the renamed packages. The provides/obsoletes
are generated implicitly on openSUSE but the tumbleweed checker
is interested in an explicit conflict.

Change-Id: I653204ec811ca33776b7408ea993d758051fb74e
This commit is contained in:
Dirk Mueller 2019-10-25 09:57:12 +02:00
parent b585cea723
commit 4c34a9700d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack/python-masakariclient/python-masakariclient.spec.j2
View File

@ -3,6 +3,7 @@
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
%global oldpython python
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
@ -31,6 +32,7 @@ Requires: {{ py2pkg('oslo.i18n') }}
Requires: {{ py2pkg('oslo.serialization') }}
Requires: {{ py2pkg('oslo.utils') }}
Requires: {{ py2pkg('pbr') }}
Conflicts: %oldpython-masakariclient < %version
BuildArch: noarch
%if 0%{?suse_version}
Requires(post): update-alternatives
@ -51,6 +53,9 @@ Summary: Documentation for OpenStack Masakari API client libary
Group: Documentation/HTML
BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py3('openstackdocstheme') }}
%if 0%{?suse_version}
Obsoletes: %oldpython-masakariclient < %version
%endif
%description -n {{ pypi_name }}-doc
Client library for Masakari built on the Masakari API. It provides a Python API

2
openstack/python-mistralclient/python-mistralclient.spec.j2
View File

@ -3,6 +3,7 @@
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
%global oldpython python
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
@ -33,6 +34,7 @@ Requires: {{ py2pkg('osprofiler') }}
Requires: {{ py2pkg('requests') }}
Requires: {{ py2pkg('six') }}
Requires: {{ py2pkg('stevedore') }}
Conflicts: %{oldpython}-mistralclient < %version
BuildArch: noarch
%if 0%{?suse_version}
Requires(post): update-alternatives

3
openstack/yaql/yaql.spec.j2
View File

@ -2,7 +2,7 @@
{% set upstream_version = upstream_version('1.1.3') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
%global oldpython python
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
@ -28,6 +28,7 @@ Requires: {{ py2pkg('Babel') }}
Requires: {{ py2pkg('ply') }}
Requires: {{ py2pkg('python-dateutil') }}
Requires: {{ py2pkg('six') }}
Conflicts: %{oldpython}-yaql < %version-%release
BuildArch: noarch
%if 0%{?suse_version}
Requires(post): update-alternatives