From 31fb30fb935e2a370db6981262f4f258a6f18201 Mon Sep 17 00:00:00 2001 From: jorton Date: Jan 31 2006 13:08:46 +0000 Subject: - run check-swig-py in %check (#178448) - relax JDK requirement (Kenneth Porter, #177367) --- diff --git a/subversion.spec b/subversion.spec index b71b98f..488a410 100644 --- a/subversion.spec +++ b/subversion.spec @@ -9,14 +9,14 @@ %endif # set JDK path to build javahl; default for JPackage -%define jdk_path /usr/lib/jvm/java-1.4.2-gcj +%define jdk_path /usr/lib/jvm/java %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.3.0 -Release: 3 +Release: 4 License: BSD Group: Development/Tools URL: http://subversion.tigris.org/ @@ -85,7 +85,7 @@ This package includes the Perl bindings to the Subversion libraries. Group: Development/Libraries Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: java-1.4.2-devel %description javahl This package includes the JNI bindings to the Subversion libraries. @@ -185,7 +185,7 @@ ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL %if %{make_check} %check export LANG=C LC_ALL=C -make check check-swig-pl CLEANUP=yes +make check check-swig-pl check-swig-py CLEANUP=yes # check-swig-rb omitted: it runs svnserve %endif @@ -252,6 +252,10 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Tue Jan 31 2006 Joe Orton 1.3.0-4 +- run check-swig-py in %%check (#178448) +- relax JDK requirement (Kenneth Porter, #177367) + * Tue Jan 31 2006 Joe Orton 1.3.0-3 - rebuild for neon 0.25