From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 1 Aug 2013 13:01:22 +0000 (+0200)
Subject: ceph.spec.in: merge back JUnit handling from SUSE spec
X-Git-Tag: v0.67~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=caaaf2c2112f6a80463445d3cb9285efe0d80c07;p=ceph.git

ceph.spec.in: merge back JUnit handling from SUSE spec

Merge back what we have in the (open)SUSE ceph spec file for JUnit.
Add missing Requires and the package is named junit4 on some SUSE
versions.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index d61be40de8f9..1a22b12f5c49 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -238,6 +238,13 @@ 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.