Browse code
Fix python-ceph and compat-gdbm-devel obsolete gdbm-devel
Change-Id: Ib3d54e776e9af66b8b30fe286fbd5d1c9ae7593f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3609
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
DheerajSShetty authored on 2017/08/23 05:50:33Showing 2 changed files
| ... | ... |
@@ -13,7 +13,7 @@ |
| 13 | 13 |
################################################################################# |
| 14 | 14 |
Name: ceph |
| 15 | 15 |
Version: 11.2.0 |
| 16 |
-Release: 8%{?dist}
|
|
| 16 |
+Release: 9%{?dist}
|
|
| 17 | 17 |
Epoch: 1 |
| 18 | 18 |
Summary: User space components of the Ceph file system |
| 19 | 19 |
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT |
| ... | ... |
@@ -426,12 +426,12 @@ descriptions, and submitting the command to the appropriate daemon. |
| 426 | 426 |
Summary: Compatibility package for Cephs python libraries |
| 427 | 427 |
Group: System Environment/Libraries |
| 428 | 428 |
License: LGPL-2.0 |
| 429 |
-Obsoletes: python-ceph |
|
| 429 |
+Obsoletes: python-ceph < %{epoch}:%{version}-%{release}
|
|
| 430 | 430 |
Requires: python-rados = %{epoch}:%{version}-%{release}
|
| 431 | 431 |
Requires: python-rbd = %{epoch}:%{version}-%{release}
|
| 432 | 432 |
Requires: python-cephfs = %{epoch}:%{version}-%{release}
|
| 433 | 433 |
Requires: python-rgw = %{epoch}:%{version}-%{release}
|
| 434 |
-Provides: python-ceph |
|
| 434 |
+Provides: python-ceph = %{epoch}:%{version}-%{release}
|
|
| 435 | 435 |
%description -n python-ceph-compat |
| 436 | 436 |
This is a compatibility package to accommodate python-ceph split into |
| 437 | 437 |
python-rados, python-rbd, python-rgw and python-cephfs. Packages still |
| ... | ... |
@@ -997,6 +997,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
|
| 997 | 997 |
# actually build this meta package. |
| 998 | 998 |
|
| 999 | 999 |
%changelog |
| 1000 |
+* Tue Aug 22 2017 Dheeraj Shetty <dheerajs@vmware.com> 11.2.0-9 |
|
| 1001 |
+- Add version and release number to python-ceph |
|
| 1000 | 1002 |
* Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 11.2.0-8 |
| 1001 | 1003 |
- Add gdbm-devel to BuildRequires |
| 1002 | 1004 |
* Thu Jun 08 2017 Xiaolin Li <xiaolinl@vmware.com> 11.2.0-7 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The GNU Database routines compatibility library |
| 2 | 2 |
Name: compat-gdbm |
| 3 | 3 |
Version: 1.8.3 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
URL: http://www.gnu.org/software/gdbm |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -17,7 +17,7 @@ The compat-gdbm package contains an older version of gdbm for compatibility purp |
| 17 | 17 |
%package devel |
| 18 | 18 |
Summary: Development libraries and header files for the gdbm library |
| 19 | 19 |
Group: Development/Libraries |
| 20 |
-Conflicts: gdbm |
|
| 20 |
+Conflicts: gdbm-devel |
|
| 21 | 21 |
Requires: %{name} = %{version}-%{release}
|
| 22 | 22 |
|
| 23 | 23 |
%description devel |
| ... | ... |
@@ -63,6 +63,8 @@ rm -rf %{buildroot}%{_infodir}
|
| 63 | 63 |
%{_includedir}/*.h
|
| 64 | 64 |
|
| 65 | 65 |
%changelog |
| 66 |
+* Tue Aug 22 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.8.3-3 |
|
| 67 |
+- gdbm-devel conflicts with compat-gdbm-devel |
|
| 66 | 68 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.3-2 |
| 67 | 69 |
- GA - Bump release of all rpms |
| 68 | 70 |
* Fri Nov 13 2015 Anish Swaminathan <anishs@vmware.com> 1.8.3-1 |