From: Ken Dreyer Date: Tue, 9 Dec 2014 21:52:19 +0000 (-0700) Subject: Revert "ceph.spec.: add epoch" X-Git-Tag: v0.80.8~4^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7faae891aefa4c21c50430fa03d9204a86d082f8;p=ceph.git Revert "ceph.spec.: add epoch" If ICE ships 0.80.8, then it will be newer than what RHCEPH ships (0.80.7), and users won't be able to seamlessly upgrade via Yum. We have three options: A) Revert the "Epoch: 1" change on the Firefly branch. B) Revert the "Epoch: 1" change in the ICE packages. C) Bump the Epoch to "2" in Red Hat's packages. This commit does Option A. Option B may or may not be feasible - it would require a "downstream" change in ICE, and we haven't done that sort of thing before. Due to the RHEL release schedule, Option C is not available to us at this point. This reverts commit b890c1e4706d7cfef7ed24c9df65b439b4f7ff1d. --- diff --git a/ceph.spec.in b/ceph.spec.in index 30a64aa96d09..02b300bd599c 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -11,7 +11,6 @@ Name: ceph Version: @VERSION@ Release: @RPM_RELEASE@%{?dist} -Epoch: 1 Summary: User space components of the Ceph file system License: GPL-2.0 Group: System Environment/Base @@ -20,10 +19,10 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 %if 0%{?fedora} || 0%{?centos} || 0%{?rhel} Patch0: init-ceph.in-fedora.patch %endif -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: libcephfs1 = %{epoch}:%{version}-%{release} -Requires: ceph-common = %{epoch}:%{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Requires: ceph-common = %{version}-%{release} Requires: python Requires: python-argparse Requires: python-ceph @@ -103,9 +102,9 @@ block and file system storage. %package -n ceph-common Summary: Ceph Common Group: System Environment/Base -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: python-ceph = %{epoch}:%{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: python-ceph = %{version}-%{release} Requires: python-requests Requires: redhat-lsb-core %description -n ceph-common @@ -123,8 +122,8 @@ FUSE based client for Ceph distributed network file system Summary: Ceph fuse-based client Group: System Environment/Base Requires: %{name} -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: librbd1 = %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} BuildRequires: fuse-devel %description -n rbd-fuse FUSE based client to map Ceph rbd images to files @@ -133,11 +132,11 @@ FUSE based client to map Ceph rbd images to files Summary: Ceph headers Group: Development/Libraries License: LGPL-2.0 -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: libcephfs1 = %{epoch}:%{version}-%{release} -Requires: libcephfs_jni1 = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Requires: libcephfs_jni1 = %{version}-%{release} %description devel This package contains libraries and headers needed to develop programs that use Ceph. @@ -145,8 +144,8 @@ that use Ceph. %package radosgw Summary: Rados REST gateway Group: Development/Libraries -Requires: ceph-common = %{epoch}:%{version}-%{release} -Requires: librados2 = %{epoch}:%{version}-%{release} +Requires: ceph-common = %{version}-%{release} +Requires: librados2 = %{version}-%{release} %if 0%{defined suse_version} BuildRequires: libexpat-devel BuildRequires: FastCGI-devel @@ -165,7 +164,7 @@ conjunction with any FastCGI capable web server. Summary: OCF-compliant resource agents for Ceph daemons Group: System Environment/Base License: LGPL-2.0 -Requires: %{name} = %{epoch}:%{version} +Requires: %{name} = %{version} Requires: resource-agents %description resource-agents Resource agents for monitoring and managing Ceph daemons @@ -178,7 +177,7 @@ Summary: RADOS distributed object store client library Group: System Environment/Libraries License: LGPL-2.0 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora} -Obsoletes: ceph-libs < %{epoch}:%{version}-%{release} +Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster @@ -190,9 +189,9 @@ store using a simple file-like interface. Summary: RADOS block device client library Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} %if 0%{?rhel} || 0%{?centos} || 0%{?fedora} -Obsoletes: ceph-libs < %{epoch}:%{version}-%{release} +Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librbd1 RBD is a block device striped across multiple distributed objects in @@ -205,7 +204,7 @@ Summary: Ceph distributed file system client library Group: System Environment/Libraries License: LGPL-2.0 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora} -Obsoletes: ceph-libs < %{epoch}:%{version}-%{release} +Obsoletes: ceph-libs < %{version}-%{release} Obsoletes: ceph-libcephfs %endif %description -n libcephfs1 @@ -218,8 +217,8 @@ POSIX-like interface. Summary: Python libraries for the Ceph distributed filesystem Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: librbd1 = %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} %if 0%{defined suse_version} %py_requires %endif @@ -231,7 +230,7 @@ object storage. Summary: RESTful benchmark Group: System Environment/Libraries License: LGPL-2.0 -Requires: ceph-common = %{epoch}:%{version}-%{release} +Requires: ceph-common = %{version}-%{release} %description -n rest-bench RESTful bencher that can be used to benchmark radosgw performance. @@ -239,9 +238,9 @@ RESTful bencher that can be used to benchmark radosgw performance. Summary: Ceph benchmarks and test tools Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: libcephfs1 = %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} %description -n ceph-test This package contains Ceph benchmarks and test tools. @@ -250,7 +249,7 @@ Summary: Java Native Interface library for CephFS Java bindings. Group: System Environment/Libraries License: LGPL-2.0 Requires: java -Requires: libcephfs1 = %{epoch}:%{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} BuildRequires: java-devel %description -n libcephfs_jni1 This package contains the Java Native Interface library for CephFS Java @@ -261,7 +260,7 @@ Summary: Java libraries for the Ceph File System. Group: System Environment/Libraries License: LGPL-2.0 Requires: java -Requires: libcephfs_jni1 = %{epoch}:%{version}-%{release} +Requires: libcephfs_jni1 = %{version}-%{release} BuildRequires: java-devel Requires: junit4 BuildRequires: junit4 @@ -273,9 +272,9 @@ Summary: Meta package to include ceph libraries. Group: System Environment/Libraries License: LGPL-2.0 Obsoletes: ceph-libs -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: libcephfs1 = %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} Provides: ceph-libs %description libs-compat