From 53e2f702681dc08ddd0414b116e51de6488f42ca Mon Sep 17 00:00:00 2001 From: Owen Synge Date: Mon, 8 Jun 2015 17:48:55 +0200 Subject: [PATCH] ceph.spec.in:BuildRequires sharutils The uudecode binary is used to build Java-related components, and uudecode is provided by the sharutils package on all supported RPM platforms. When building with "--without=cephfs_java", sharutils is not needed. Thanks to Nathan Cutler for going into the details with me. On OBS without this patch we get the error message: [ 170s] ----------------------------------------------------------------- [ 170s] ----- building ceph.spec (user abuild) [ 170s] ----------------------------------------------------------------- [ 170s] ----------------------------------------------------------------- [ 170s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/home:osynge:ceph:wip:wip_obs_fedora/Fedora_20/c0bbbc1e62228ca956ac3d367edc4fba-master' /home/abuild/rpmbuild/SOURCES/ceph.spec [ 170s] error: Failed build dependencies: [ 170s] sharutils is needed by ceph-1:2+git.1435043747.c1bd02c-1.1.x86_64 With this patch we can build fedora 22 and fedora 20 rpms fine. Signed-off-by: Owen Synge (cherry picked from commit 43c1784640538b813f0575c50f721ac911a30b3e) Conflicts: ceph.spec.in _with_systemd -> trivial resolution --- ceph.spec.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index d62e6f1cb1377..19730bf6a1357 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -39,6 +39,9 @@ Requires: util-linux Requires: hdparm Requires: cryptsetup Requires(post): binutils +%if 0%{with cephfs_java} +BuildRequires: sharutils +%endif BuildRequires: gcc-c++ BuildRequires: boost-devel %if 0%{defined suse_version} @@ -79,10 +82,6 @@ BuildRequires: net-tools ################################################################################# # specific ################################################################################# -%if ! 0%{?rhel} || 0%{?fedora} -BuildRequires: sharutils -%endif - %if 0%{defined suse_version} %if 0%{?suse_version} > 1210 Requires: gptfdisk -- 2.39.5