From 45460b0288e18e28824401ff175e6cf2ee60bfa1 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 9 Jul 2015 12:20:59 +0200 Subject: [PATCH] ceph.spec.in: strip out all instances of %{epoch}: Signed-off-by: Nathan Cutler (cherry picked from commit 7ec18822f33bd30df04463dd9d02cde90d71986b) Conflicts: ceph.spec.in missing -{%release} in libradosstriper1 requires --- ceph.spec.in | 117 +++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 8f22f43aa55b2..3da1768cca649 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -40,7 +40,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 @@ -52,13 +51,13 @@ Patch0: init-ceph.in-fedora.patch ################################################################################# # dependencies that apply across all distro families ################################################################################# -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: librados2 = %{epoch}:%{version}-%{release} -Requires: libcephfs1 = %{epoch}:%{version}-%{release} -Requires: ceph-common = %{epoch}:%{version}-%{release} -Requires: python-rados = %{epoch}:%{version}-%{release} -Requires: python-rbd = %{epoch}:%{version}-%{release} -Requires: python-cephfs = %{epoch}:%{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Requires: ceph-common = %{version}-%{release} +Requires: python-rados = %{version}-%{release} +Requires: python-rbd = %{version}-%{release} +Requires: python-cephfs = %{version}-%{release} Requires: python Requires: python-requests Requires: grep @@ -152,11 +151,11 @@ 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-rados = %{epoch}:%{version}-%{release} -Requires: python-rbd = %{epoch}:%{version}-%{release} -Requires: python-cephfs = %{epoch}:%{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: librados2 = %{version}-%{release} +Requires: python-rados = %{version}-%{release} +Requires: python-rbd = %{version}-%{release} +Requires: python-cephfs = %{version}-%{release} Requires: python-requests %if 0%{?rhel} || 0%{?fedora} Requires: redhat-lsb-core @@ -181,8 +180,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 @@ -190,8 +189,8 @@ FUSE based client to map Ceph rbd images to files %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 @@ -210,7 +209,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 @@ -223,7 +222,7 @@ Summary: RADOS distributed object store client library Group: System Environment/Libraries License: LGPL-2.0 %if 0%{?rhel} || 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 @@ -235,8 +234,8 @@ store using a simple file-like interface. Summary: RADOS headers Group: Development/Libraries License: LGPL-2.0 -Requires: librados2 = %{epoch}:%{version}-%{release} -Obsoletes: ceph-devel < %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} +Obsoletes: ceph-devel < %{version}-%{release} %description -n librados2-devel This package contains libraries and headers needed to develop programs that use RADOS object store. @@ -245,8 +244,8 @@ that use RADOS object store. Summary: Python libraries for the RADOS object store Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{epoch}:%{version}-%{release} -Obsoletes: python-ceph < %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} +Obsoletes: python-ceph < %{version}-%{release} %description -n python-rados This package contains Python libraries for interacting with Cephs RADOS object store. @@ -255,7 +254,7 @@ object store. Summary: RADOS striping interface Group: System Environment/Libraries License: LGPL-2.0 -Requires: librados2 = %{epoch}:%{version}-%{release} +Requires: librados2 = %{version}-%{release} %description -n libradosstriper1 Striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard rados objects using @@ -265,9 +264,9 @@ an interface very similar to the rados one. Summary: RADOS striping interface headers Group: Development/Libraries License: LGPL-2.0 -Requires: libradosstriper1 = %{epoch}:%{version}-%{release} -Requires: librados2-devel = %{epoch}:%{version}-%{release} -Obsoletes: ceph-devel < %{epoch}:%{version}-%{release} +Requires: libradosstriper1 = %{version}-%{release} +Requires: librados2-devel = %{version}-%{release} +Obsoletes: ceph-devel < %{version}-%{release} %description -n libradosstriper1-devel This package contains libraries and headers needed to develop programs that use RADOS striping interface. @@ -276,9 +275,9 @@ that use RADOS striping 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%{?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 @@ -290,9 +289,9 @@ shared library allowing applications to manage these block devices. Summary: RADOS block device headers Group: Development/Libraries License: LGPL-2.0 -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: librados2-devel = %{epoch}:%{version}-%{release} -Obsoletes: ceph-devel < %{epoch}:%{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: librados2-devel = %{version}-%{release} +Obsoletes: ceph-devel < %{version}-%{release} %description -n librbd1-devel This package contains libraries and headers needed to develop programs that use RADOS block device. @@ -301,9 +300,9 @@ that use RADOS block device. Summary: Python libraries for the RADOS block device Group: System Environment/Libraries License: LGPL-2.0 -Requires: librbd1 = %{epoch}:%{version}-%{release} -Requires: python-rados = %{epoch}:%{version}-%{release} -Obsoletes: python-ceph < %{epoch}:%{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: python-rados = %{version}-%{release} +Obsoletes: python-ceph < %{version}-%{release} %description -n python-rbd This package contains Python libraries for interacting with Cephs RADOS block device. @@ -313,7 +312,7 @@ Summary: Ceph distributed file system client library Group: System Environment/Libraries License: LGPL-2.0 %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libs < %{epoch}:%{version}-%{release} +Obsoletes: ceph-libs < %{version}-%{release} Obsoletes: ceph-libcephfs %endif %description -n libcephfs1 @@ -326,9 +325,9 @@ POSIX-like interface. Summary: Ceph distributed file system headers Group: Development/Libraries License: LGPL-2.0 -Requires: libcephfs1 = %{epoch}:%{version}-%{release} -Requires: librados2-devel = %{epoch}:%{version}-%{release} -Obsoletes: ceph-devel < %{epoch}:%{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Requires: librados2-devel = %{version}-%{release} +Obsoletes: ceph-devel < %{version}-%{release} %description -n libcephfs1-devel This package contains libraries and headers needed to develop programs that use Cephs distributed file system. @@ -337,9 +336,9 @@ that use Cephs distributed file system. Summary: Python libraries for Ceph distributed file system Group: System Environment/Libraries License: LGPL-2.0 -Requires: libcephfs1 = %{epoch}:%{version}-%{release} -Requires: python-rados = %{epoch}:%{version}-%{release} -Obsoletes: python-ceph < %{epoch}:%{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Requires: python-rados = %{version}-%{release} +Obsoletes: python-ceph < %{version}-%{release} %description -n python-cephfs This package contains Python libraries for interacting with Cephs distributed file system. @@ -348,7 +347,7 @@ file system. 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. @@ -372,7 +371,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 @@ -383,8 +382,8 @@ Summary: Development files for CephFS Java Native Interface library Group: System Environment/Libraries License: LGPL-2.0 Requires: java -Requires: libcephfs_jni1 = %{epoch}:%{version}-%{release} -Obsoletes: ceph-devel < %{epoch}:%{version}-%{release} +Requires: libcephfs_jni1 = %{version}-%{release} +Obsoletes: ceph-devel < %{version}-%{release} %description -n libcephfs_jni1-devel This package contains the development files for CephFS Java Native Interface library. @@ -394,7 +393,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 %if 0%{?el6} Requires: junit4 @@ -415,9 +414,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 @@ -434,13 +433,13 @@ Summary: Compatibility package for Ceph headers Group: Development/Libraries License: LGPL-2.0 Obsoletes: ceph-devel -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: librados2-devel = %{epoch}:%{version}-%{release} -Requires: libradosstriper1-devel = %{epoch}:%{version}-%{release} -Requires: librbd1-devel = %{epoch}:%{version}-%{release} -Requires: libcephfs1-devel = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} +Requires: librados2-devel = %{version}-%{release} +Requires: libradosstriper1-devel = %{version}-%{release} +Requires: librbd1-devel = %{version}-%{release} +Requires: libcephfs1-devel = %{version}-%{release} %if 0%{with cephfs_java} -Requires: libcephfs_jni1-devel = %{epoch}:%{version}-%{release} +Requires: libcephfs_jni1-devel = %{version}-%{release} %endif Provides: ceph-devel %description devel-compat @@ -454,9 +453,9 @@ Summary: Compatibility package for Cephs python libraries Group: System Environment/Libraries License: LGPL-2.0 Obsoletes: python-ceph -Requires: python-rados = %{epoch}:%{version}-%{release} -Requires: python-rbd = %{epoch}:%{version}-%{release} -Requires: python-cephfs = %{epoch}:%{version}-%{release} +Requires: python-rados = %{version}-%{release} +Requires: python-rbd = %{version}-%{release} +Requires: python-cephfs = %{version}-%{release} Provides: python-ceph %description -n python-ceph-compat This is a compatibility package to accommodate python-ceph split into -- 2.39.5