Merge pull request ceph#4981 from ceph/wip-fedora-build-fixes

Fix various issues with fedora (f21+) builds Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
weiqian · Jun 24, 2015 · b5e5778 · b5e5778
2 parents 075fb9f + 85517d6
commit b5e5778
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -58,6 +58,7 @@ Requires: systemd
 BuildRequires: sharutils
 %endif
 BuildRequires:	gcc-c++
+BuildRequires:	git
 BuildRequires:	boost-devel
 BuildRequires:	cryptsetup
 BuildRequires:	gdbm
@@ -103,7 +104,6 @@ BuildRequires:	snappy-devel
 BuildRequires:	net-tools
 BuildRequires:	libbz2-devel
 BuildRequires:	sharutils
-BuildRequires:	git
 %if 0%{?suse_version} > 1210
 Requires:	gptfdisk
 %if 0%{with tcmalloc}
@@ -974,7 +974,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_mandir}/man8/rbd-replay-prep.8*
 %{_bindir}/rbd-replay
 %{_bindir}/rbd-replay-many
-%if (0%{?fedora} >= 20 || 0%{?rhel} == 6)
+%if (0%{?fedora} == 20 || 0%{?rhel} == 6)
 %{_bindir}/rbd-replay-prep
 %endif
 

diff --git a/configure.ac b/configure.ac
@@ -629,9 +629,9 @@ if test "x$enable_cephfs_java" = "xyes"; then
         # the search path.
         AS_IF([test "x$with_debug" = "xyes"], [
         	dir='/usr/share/java'
-	        junit4_jar=`find $dir -name junit4.jar -o -name junit.jar | head -n 1`
+	        junit4_jar=`( find $dir -name junit4.jar;find $dir -name junit.jar ) | head -n 1`
 		AS_IF([test -r "$junit4_jar"], [
-		      EXTRA_CLASSPATH_JAR=$junit4_jar
+		      EXTRA_CLASSPATH_JAR="$junit4_jar"
 		      AC_SUBST(EXTRA_CLASSPATH_JAR)
 		      [have_junit4=1]], [
 		      AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)])