branto pushed to ceph (f22). "add version numbers to Obsoletes (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 11:11:25 UTC 2015


>From 48fd62dda405f3d49ebb54b4668d04a60798804c Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Mon, 16 Feb 2015 11:41:42 -0700
Subject: add version numbers to Obsoletes

The ceph-devel and python-ceph packages were split out, but there were
no version numbers added to the Obsoletes during the split.

This means that we obsolete packages that are far newer than us. This
impacts packages coming from upstream's "gitbuilder" system (for
example), as well as any other upstream RPMs until this package split is
done upstream.

Add version numbers to the Obsoletes. I've chosen to use a
version+release number that's lower than what we currently ship in
Fedora (0.87-1), but newer than what we shipped in the last Fedora
update (0.80.6-1).

diff --git a/ceph.spec b/ceph.spec
index 8cbcd85..daabee3 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -12,7 +12,7 @@
 #################################################################################
 Name:		ceph
 Version:	0.87.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
 License:	GPLv2
@@ -196,7 +196,7 @@ Summary:	RADOS headers
 Group:		Development/Libraries
 License:	LGPL-2.0
 Requires:	librados2 = %{epoch}:%{version}-%{release}
-Obsoletes:	ceph-devel
+Obsoletes:	ceph-devel < 1:0.80.6-1
 %description -n librados2-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS object store.
@@ -206,7 +206,7 @@ Summary:	Python libraries for the RADOS object store
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	librados2 = %{epoch}:%{version}-%{release}
-Obsoletes:	python-ceph
+Obsoletes:	python-ceph < 1:0.80.6-1
 %if 0%{defined suse_version}
 %py_requires
 %endif
@@ -254,7 +254,7 @@ Group:		Development/Libraries
 License:	LGPL-2.0
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	ceph-devel
+Obsoletes:	ceph-devel < 1:0.80.6-1
 %description -n librbd1-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS block device.
@@ -265,7 +265,7 @@ Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	python-rados = %{epoch}:%{version}-%{release}
-Obsoletes:	python-ceph
+Obsoletes:	python-ceph < 1:0.80.6-1
 %description -n python-rbd
 This package contains Python libraries for interacting with Cephs RADOS
 block device.
@@ -290,7 +290,7 @@ Group:		Development/Libraries
 License:	LGPL-2.0
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
 Requires:	librados2-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	ceph-devel
+Obsoletes:	ceph-devel < 1:0.80.6-1
 %description -n libcephfs1-devel
 This package contains libraries and headers needed to develop programs
 that use Cephs distributed file system.
@@ -301,7 +301,7 @@ Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
 Requires:	python-rados = %{epoch}:%{version}-%{release}
-Obsoletes:	python-ceph
+Obsoletes:	python-ceph < 1:0.80.6-1
 %description -n python-cephfs
 This package contains Python libraries for interacting with Cephs distributed
 file system.
@@ -917,6 +917,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %files -n python-ceph-compat
 
 %changelog
+* Wed Apr 01 2015 Ken Dreyer <ktdreyer at ktdreyer.com> - 1:0.87.1-3
+- add version numbers to Obsoletes (RHBZ #1193182)
+
 * Wed Mar 4 2015 Boris Ranto <branto at redhat.com> - 1:0.87.1-2
 - Perform a hardened build
 - Use git-formatted patches
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ceph.git/commit/?h=f22&id=48fd62dda405f3d49ebb54b4668d04a60798804c


More information about the scm-commits mailing list