diff --git a/subversion.spec b/subversion.spec index fc0fdc2..21a1e6c 100644 --- a/subversion.spec +++ b/subversion.spec @@ -17,7 +17,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.6.17 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.apache.org/ @@ -136,6 +136,8 @@ Requires: subversion%{?_isa} = %{version}-%{release} BuildRequires: java-devel-openjdk # JAR repacking requires both zip and unzip in the buildroot BuildRequires: zip, unzip +# For the tests +BuildRequires: junit %description javahl This package includes the JNI bindings to the Subversion libraries. @@ -221,6 +223,7 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS" --disable-static --with-sasl=%{_prefix} \ --disable-neon-version-check \ --with-gnome-keyring \ + --with-junit=%{_prefix}/share/java/junit.jar \ --with-kwallet \ --with-berkeley-db || (cat config.log; exit 1) make %{?_smp_mflags} all @@ -323,6 +326,9 @@ export MALLOC_PERTURB_=171 MALLOC_CHECK_=3 export LIBC_FATAL_STDERR_=1 make check check-swig-pl check-swig-py CLEANUP=yes # check-swig-rb omitted: it runs svnserve +%if %{with_java} +make check-javahl +%endif %endif %clean @@ -441,6 +447,9 @@ fi %{_mandir}/man1/svn2cl.1* %changelog +* Wed Jul 20 2011 Joe Orton - 1.6.17-4 +- run javahl tests (Blair Zajac, #723338) + * Wed Jul 20 2011 Joe Orton - 1.6.17-3 - split out python subpackage