[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ceph.spec.in: fix lttng/babeltrace conditionals #5193

Merged
merged 1 commit into from
Sep 4, 2015
Merged

ceph.spec.in: fix lttng/babeltrace conditionals #5193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
ceph.spec.in: fix lttng/babeltrace conditionals 
lttng and babeltrace are build dependencies for rbd-replay-prep. Make
sure the right package names are used. Enable for SLE12, as well as
for openSUSE 13.1 and higher.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

http://tracker.ceph.com/issues/12360 Fixes: #12360

Signed-off-by: Nathan Cutler <ncutler@suse.com>

sqme
  • Loading branch information
@smithfarm
smithfarm committed Sep 4, 2015
commit e267128ce22d8b8cd83f6d6d82f24f496600e678
19 changes: 12 additions & 7 deletions ceph.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ BuildRequires: cmake
BuildRequires: cryptsetup
BuildRequires: gdbm
BuildRequires: hdparm
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libcurl-devel
BuildRequires: libedit-devel
BuildRequires: libxml2-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libudev-devel
BuildRequires: libtool
BuildRequires: leveldb-devel > 1.2
BuildRequires: make
BuildRequires: perl
BuildRequires: parted
BuildRequires: perl
BuildRequires: pkgconfig
BuildRequires: python
BuildRequires: python-nose
Expand Down Expand Up @@ -159,6 +159,15 @@ Requires(preun): initscripts
BuildRequires: gperftools-devel
Requires: python-flask
%endif
# lttng and babeltrace for rbd-replay-prep
%if 0%{?fedora} || 0%{?rhel} == 6
BuildRequires: lttng-ust-devel
BuildRequires: libbabeltrace-devel
%endif
%if 0%{?suse_version} >= 1310
BuildRequires: lttng-ust-devel
BuildRequires: babeltrace-devel
%endif

%description
Ceph is a massively scalable, open-source, distributed
Expand Down Expand Up @@ -371,10 +380,6 @@ Group: System Environment/Libraries
License: LGPL-2.0
Requires: ceph-common
Requires: xmlstarlet
%if (0%{?fedora} || 0%{?rhel} == 6)
BuildRequires: lttng-ust-devel
BuildRequires: libbabeltrace-devel
%endif
%description -n ceph-test
This package contains Ceph benchmarks and test tools.

Expand Down Expand Up @@ -1093,7 +1098,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
%{_mandir}/man8/rbd-replay-prep.8*
%{_bindir}/rbd-replay
%{_bindir}/rbd-replay-many
%if (0%{?fedora} || 0%{?rhel} == 6)
%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} >= 1310
%{_bindir}/rbd-replay-prep
%endif
%dir %{_libdir}/ceph
Expand Down