summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-14 16:48:17 -0700
committerSage Weil <sage@inktank.com>2013-10-14 16:48:17 -0700
commitb0994e7011b3427bcd685e3d89e4eb61d0c25a7e (patch)
tree50fc2e4ee2e541d2f8500aad304f416232b648fc
parent7f0d644cb47394c7e2ff625ebfbef81a88af1e3b (diff)
parent16dec28c02292e6650565d1031d7aa9fbdabfa00 (diff)
downloadceph-b0994e7011b3427bcd685e3d89e4eb61d0c25a7e.tar.gz
Merge pull request #694 from grosskur/fix-rpm-junit4
ceph.spec.in: Always depend on junit4 (fixes bug #6216) Reviewed-by: Loic Dachary <loic@dachary.org>
-rw-r--r--ceph.spec.in6
1 files changed, 0 insertions, 6 deletions
diff --git a/ceph.spec.in b/ceph.spec.in
index a60d87ad814..5d5d5867593 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -239,14 +239,8 @@ License: LGPL-2.0
Requires: java
Requires: libcephfs_jni1 = %{version}-%{release}
BuildRequires: java-devel
-%if 0%{?suse_version} > 1220
Requires: junit4
BuildRequires: junit4
-%else
-Requires: junit
-BuildRequires: junit
-%endif
-BuildRequires: junit
%description -n cephfs-java
This package contains the Java libraries for the Ceph File System.