]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15286 from smithfarm/wip-cond-epoch
authorKefu Chai <tchaikov@gmail.com>
Thu, 1 Jun 2017 11:41:41 +0000 (19:41 +0800)
committerGitHub <noreply@github.com>
Thu, 1 Jun 2017 11:41:41 +0000 (19:41 +0800)
build/ops: rpm: apply epoch only if %epoch macro is defined

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
ceph.spec.in

diff --cc ceph.spec.in
index 782d1a812a8102fd04669a1669844b31e3010122,971b59a2bb8a25a90359105a9f124dbead94bfc1..dbbd615fb793caf0e58fe669c3f5e870b9c16699
@@@ -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