From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 15 Aug 2019 11:28:51 +0000 (+0200)
Subject: rpm: always build ceph-test package
X-Git-Tag: v12.2.13~136^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94de966248fbd8ffe9f1fc9e988df95891a2fbab;p=ceph.git

rpm: always build ceph-test package

Fixes: https://tracker.ceph.com/issues/41296
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit b9c744301051aa637f948be074be7b53c26cb504)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8f7475e8435..dd5a20e7068 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -16,6 +16,7 @@
 #
 %bcond_without ocf
 %bcond_with make_check
+%bcond_without ceph_test_package
 %ifarch s390 s390x
 %bcond_with tcmalloc
 %else
@@ -23,14 +24,12 @@
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
-%bcond_without ceph_test_package
 %bcond_without cephfs_java
 %bcond_with lowmem_builder
 %bcond_without lttng
 %endif
 %if 0%{?suse_version}
 %bcond_with selinux
-%bcond_with ceph_test_package
 %bcond_with cephfs_java
 %bcond_without lowmem_builder
 %ifarch x86_64 aarch64