Skip to content

Commit

Permalink
Merge pull request ceph#15417 from smithfarm/wip-cond-epoch-2
Browse files Browse the repository at this point in the history
build/ops: rpm: move _epoch_prefix below Epoch definition
  • Loading branch information
liewegas authored Jun 2, 2017
2 parents b5da257 + 3e30232 commit 6912c4f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@
# disable dwz which compresses the debuginfo
%global _find_debuginfo_dwz_opts %{nil}

# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
%global _epoch_prefix %{?epoch:%{epoch}:}

#################################################################################
# main package definition
#################################################################################
Expand All @@ -70,6 +67,10 @@ Release: @RPM_RELEASE@%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
%endif

# define %_epoch_prefix macro which will expand to the empty string if %epoch is undefined
%global _epoch_prefix %{?epoch:%{epoch}:}

Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
%if 0%{?suse_version}
Expand Down

0 comments on commit 6912c4f

Please sign in to comment.