]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: move BuildRequires out of subpackages
authorNathan Cutler <ncutler@suse.com>
Mon, 28 Sep 2015 19:59:20 +0000 (21:59 +0200)
committerNathan Cutler <ncutler@suse.com>
Wed, 7 Oct 2015 15:47:14 +0000 (17:47 +0200)
Since the main package and all the subpackages are built in the
same environment, concentrate all the BuildRequires in the main
package.

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

index 5dd20ade380feeea7c15a98c808af659c86eb9cf..9d2b4b762cb76d6e3d90209112ef795a47ea80db 100644 (file)
@@ -89,7 +89,8 @@ Requires:     findutils
 Requires:      which
 Requires(post):        binutils
 %if 0%{with cephfs_java}
-BuildRequires: sharutils
+BuildRequires: java-devel
+BuildRequires: sharutils
 %endif
 %if 0%{with selinux}
 BuildRequires: checkpolicy
@@ -100,6 +101,7 @@ BuildRequires:      gcc-c++
 BuildRequires: boost-devel
 BuildRequires:  cmake
 BuildRequires: cryptsetup
+BuildRequires: fuse-devel
 BuildRequires: gdbm
 BuildRequires: hdparm
 BuildRequires: leveldb-devel > 1.2
@@ -176,6 +178,10 @@ Requires:  python-flask
 %if 0%{?fedora} || 0%{?rhel} 
 BuildRequires:  boost-random
 %endif
+# python-argparse for distros with Python 2.6 or lower
+%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?suse_version} && 0%{?suse_version} <= 1110)
+BuildRequires: python-argparse
+%endif
 # lttng and babeltrace for rbd-replay-prep
 %if 0%{?fedora} || 0%{?rhel} == 6
 BuildRequires: lttng-ust-devel
@@ -185,6 +191,15 @@ BuildRequires:     libbabeltrace-devel
 BuildRequires: lttng-ust-devel
 BuildRequires:  babeltrace-devel
 %endif
+# expat and fastcgi for RGW
+%if 0%{?suse_version}
+BuildRequires: libexpat-devel
+BuildRequires: FastCGI-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: expat-devel
+BuildRequires: fcgi-devel
+%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed
@@ -216,7 +231,6 @@ Requires(pre):      pwdutils
 # python-argparse is only needed in distros with Python 2.6 or lower
 %if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?suse_version} && 0%{?suse_version} <= 1110)
 Requires:      python-argparse
-BuildRequires: python-argparse
 %endif
 %description -n ceph-common
 Common utilities to mount and interact with a ceph storage cluster.
@@ -225,7 +239,6 @@ Common utilities to mount and interact with a ceph storage cluster.
 Summary:       Ceph fuse-based client
 Group:         System Environment/Base
 Requires:      %{name}
-BuildRequires: fuse-devel
 %description fuse
 FUSE based client for Ceph distributed network file system
 
@@ -235,7 +248,6 @@ Group:              System Environment/Base
 Requires:      %{name}
 Requires:      librados2 = %{epoch}:%{version}-%{release}
 Requires:      librbd1 = %{epoch}:%{version}-%{release}
-BuildRequires: fuse-devel
 %description -n rbd-fuse
 FUSE based client to map Ceph rbd images to files
 
@@ -247,13 +259,7 @@ Requires:  ceph-common = %{epoch}:%{version}-%{release}
 Requires:      ceph-selinux = %{epoch}:%{version}-%{release}
 %endif
 Requires:      librados2 = %{epoch}:%{version}-%{release}
-%if 0%{?suse_version}
-BuildRequires: libexpat-devel
-BuildRequires: FastCGI-devel
-%endif
 %if 0%{?rhel} || 0%{?fedora}
-BuildRequires: expat-devel
-BuildRequires: fcgi-devel
 Requires:      mailcap
 %endif
 %description radosgw
@@ -417,7 +423,6 @@ Group:              System Environment/Libraries
 License:       LGPL-2.0
 Requires:      java
 Requires:      libcephfs1 = %{epoch}:%{version}-%{release}
-BuildRequires: java-devel
 %description -n libcephfs_jni1
 This package contains the Java Native Interface library for CephFS Java
 bindings.
@@ -439,7 +444,6 @@ Group:              System Environment/Libraries
 License:       LGPL-2.0
 Requires:      java
 Requires:      libcephfs_jni1 = %{epoch}:%{version}-%{release}
-BuildRequires: java-devel
 %if 0%{?el6}
 Requires:      junit4
 BuildRequires: junit4