From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 1 Jun 2017 11:41:41 +0000 (+0800)
Subject: Merge pull request #15286 from smithfarm/wip-cond-epoch
X-Git-Tag: ses5-milestone6~9^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92ebb7038e94b227336bb63efcdaa99dc047b22a;p=ceph.git

Merge pull request #15286 from smithfarm/wip-cond-epoch

build/ops: rpm: apply epoch only if %epoch macro is defined

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

92ebb7038e94b227336bb63efcdaa99dc047b22a
diff --cc ceph.spec.in
index 782d1a812a81,971b59a2bb8a..dbbd615fb793
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -313,10 -323,9 +319,10 @@@ License:        LGPL-2.1 and CC-BY-SA-1
  %if 0%{?suse_version}
  Group:          System/Filesystems
  %endif
- Requires:       ceph-base = %{epoch}:%{version}-%{release}
+ Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
  %if 0%{?fedora} || 0%{?rhel}
 -Requires:      python-cherrypy
 +Requires:       python-cherrypy
 +Requires:       python-werkzeug
  %endif
  %if 0%{?suse_version}
  Requires: 	python-CherryPy