From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 3 Feb 2015 15:14:23 +0000 (+0100)
Subject: ceph.spec.in: junit always except for EPEL 6
X-Git-Tag: suse_latest~41^2~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f36eaee9ea71ed48018ccb2d7eac3e809c72d82;p=ceph.git

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>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 9da9f5e0fe8c..10e317a9be31 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -282,8 +282,13 @@ License:	LGPL-2.0
 Requires:	java
 Requires:	libcephfs_jni1 = %{epoch}:%{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.