diff --git a/openstack/python-masakariclient/python-masakariclient.spec.j2 b/openstack/python-masakariclient/python-masakariclient.spec.j2 index 93fab2e2e..f384967f3 100644 --- a/openstack/python-masakariclient/python-masakariclient.spec.j2 +++ b/openstack/python-masakariclient/python-masakariclient.spec.j2 @@ -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 diff --git a/openstack/python-mistralclient/python-mistralclient.spec.j2 b/openstack/python-mistralclient/python-mistralclient.spec.j2 index 2852cd45f..9c2e79d5e 100644 --- a/openstack/python-mistralclient/python-mistralclient.spec.j2 +++ b/openstack/python-mistralclient/python-mistralclient.spec.j2 @@ -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 diff --git a/openstack/yaql/yaql.spec.j2 b/openstack/yaql/yaql.spec.j2 index 5512f16fb..ff21a70bf 100644 --- a/openstack/yaql/yaql.spec.j2 +++ b/openstack/yaql/yaql.spec.j2 @@ -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