From a870c7c7255cd915e9b281517bc2bf1b91b5f807 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 21 Feb 2017 10:26:11 +0100 Subject: rpm: replace renamed python-gluster with python2-gluster When upgrading from < 3.10, the old python-gluster package causes conflicts with the newly renamed python2-gluster package. This can be solved by adding the appropriate Provides and Obsoletes to the python2-gluster RPM. Details on renaming packages are listed on the Fedora Packaging Guidelines. Cherry picked from commit 431011098efc5702a2f49fad1975fb956cdc9e00: > Change-Id: Ib143bf69022c45abe2d5e8d31d3375a6b85f75da > URL: https://fedoraproject.org/wiki/Packaging:Guidelines#Renaming.2FReplacing_Existing_Packages > BUG: 1414902 > Signed-off-by: Niels de Vos > Reviewed-on: https://review.gluster.org/16649 > Smoke: Gluster Build System > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System > Reviewed-by: Prashanth Pai > Reviewed-by: Anoop C S Change-Id: Ib143bf69022c45abe2d5e8d31d3375a6b85f75da BUG: 1415226 Signed-off-by: Niels de Vos Reviewed-on: https://review.gluster.org/16696 Reviewed-by: Prashanth Pai Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Kaleb KEITHLEY CentOS-regression: Gluster Build System --- glusterfs.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index e3ffbb2cc3c..fdaf5ffbb01 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -464,6 +464,8 @@ Summary: GlusterFS python library Group: Development/Tools %{?python_provide:%python_provide python2-gluster} Requires: python2 +Provides: python-gluster = %{version}-%{release} +Obsoletes: python-gluster < 3.10 %description -n python2-gluster %{_python_gluster_description} @@ -1269,6 +1271,9 @@ exit 0 %endif %changelog +* Tue Feb 21 2017 Niels de Vos +- Obsolete and Provide python-gluster for upgrading from glusterfs < 3.10 + * Mon Feb 20 2017 Kaleb S. KEITHLEY - revert switch to storhaug HA -- cgit