From: Ken Dreyer <kdreyer@redhat.com>
Date: Wed, 5 Jul 2017 15:32:54 +0000 (-0600)
Subject: rpm: bump epoch ahead of RHEL base
X-Git-Tag: v12.1.1~141^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16126%2Fhead;p=ceph.git

rpm: bump epoch ahead of RHEL base

RHEL's ceph-common package is "1". Move our upstream packages' epoch
ahead of that, so that upstream will always override whatever is in
RHEL, even if it happens to have a higher NVR one day.

Fixes: http://tracker.ceph.com/issues/20508
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 2abd91a2575..6dfedebaf02 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -65,7 +65,7 @@ Name:		ceph
 Version:	@VERSION@
 Release:	@RPM_RELEASE@%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
-Epoch:		1
+Epoch:		2
 %endif
 
 # define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined