]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: rpm: fix seastar build dependencies 23386/head
authorNathan Cutler <ncutler@suse.com>
Thu, 2 Aug 2018 10:17:25 +0000 (12:17 +0200)
committerNathan Cutler <ncutler@suse.com>
Thu, 2 Aug 2018 10:19:34 +0000 (12:19 +0200)
1. cryptopp-devel was moved to the distro-specific section by
aeb974b9139d49f13e162cd90da8a0a4b3fc3b33, then
96196e9d774ab55fabb792935a09a81cf0ca9786 reintroduced it in the
non-distro-specific section, breaking install-deps.sh for SUSE

2. fmt-devel is called libfmt-devel on SUSE

Fixes: install-deps.sh on SUSE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in

index 36c727d19abd967b85bbb85d2b1c2393a6289b14..f2a445a78c0cb25498cdfa591d83deb0e27500d6 100644 (file)
@@ -178,9 +178,7 @@ BuildRequires:      socat
 %endif
 %if 0%{with seastar}
 BuildRequires:  c-ares-devel
-BuildRequires:  cryptopp-devel
 BuildRequires:  gnutls-devel
-BuildRequires:  fmt-devel
 BuildRequires:  hwloc-devel
 BuildRequires:  libpciaccess-devel
 BuildRequires:  lksctp-tools-devel
@@ -286,11 +284,13 @@ BuildRequires:  redhat-rpm-config
 %if 0%{with seastar}
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  cryptopp-devel
+BuildRequires:  fmt-devel
 BuildRequires:  numactl-devel
 BuildRequires:  protobuf-compiler
 %endif
 %if 0%{?suse_version}
 BuildRequires:  libcryptopp-devel
+BuildRequires:  libfmt-devel
 BuildRequires:  libnuma-devel
 %endif
 %endif