ceph.spec.in: junit always except for EPEL 6

The package was renamed a long time ago (around the Fedora 15
timeframe). The "junit4" name is only relevant for EPEL 6. For EPEL 7
and Fedora 20, the "junit" package has "Provides: junit4". And most
recently, in the junit package that ships in Fedora 21 and 22, the
package maintainer dropped the old Provides: line.

http://tracker.ceph.com/issues/10728 Fixes: #10728

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 4f36eaee9ea71ed48018ccb2d7eac3e809c72d82)

diff --git a/ceph.spec.in b/ceph.spec.in
index 0940ce48f2cae4ac2339d950e546543d1f2be641..67a3825825e8ab23bf8e9bd540c53666ae436f08 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -264,8 +264,13 @@ License:   LGPL-2.0
 Requires:      java
 Requires:      libcephfs_jni1 = %{version}-%{release}
 BuildRequires: java-devel
+%if 0%{?el6}
 Requires:      junit4
 BuildRequires: junit4
+%else
+Requires:       junit
+BuildRequires:  junit
+%endif
 %description -n cephfs-java
 This package contains the Java libraries for the Ceph File System.