- add -java subpackage for javahl libraries (Anthony Green, #116202)

subversion-1.1.3-java.patch

@@ -0,0 +1,11 @@
+--- subversion-1.1.0/build/ac-macros/java.m4~	2004-04-17 19:44:55.000000000 -0700
++++ subversion-1.1.0/build/ac-macros/java.m4	2005-02-01 05:53:28.081457080 -0800
+@@ -73,7 +73,7 @@ AC_DEFUN(SVN_FIND_JDK,
+     if test "$os_arch" = "Darwin"; then
+       AC_MSG_WARN([You may need to install the latest Java Development package from http://connect.apple.com/.  Apple no longer includes the JNI header files by default on Java updates.])
+     fi
+-    JDK_SUITABLE=no
++    JDK_SUITABLE=yes
+   fi
+   AC_MSG_RESULT([$JDK_SUITABLE])
+ 

subversion.spec

@@ -1,6 +1,9 @@
 # set to zero to avoid running test suite
 %define make_check 1
 
+# set JDK path to build javahl; default for JPackage
+%define jdk_path /usr/lib/jvm/java-1.4.2-gcj
+
 %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 
 Summary: Modern Version Control System designed to replace CVS
@@ -18,6 +21,7 @@ Patch1: subversion-0.24.2-swig.patch
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
 Patch6: subversion-1.0.3-pie.patch
+Patch7: subversion-1.1.3-java.patch
 BuildPreReq: autoconf, libtool, python, python-devel, texinfo
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.21-5, docbook-style-xsl
 BuildPreReq: apr-devel, apr-util-devel, neon-devel >= 0:0.24.7-1
@@ -70,12 +74,22 @@ Requires: subversion = %{version}-%{release}
 This package includes the Perl bindings to the Subversion libraries.
 %endif
 
+%package javahl
+Group: Development/Libraries
+Summary: JNI bindings to the Subversion libraries
+Requires: subversion = %{version}-%{release}
+BuildPreReq: java-1.4.2-gcj-compat-devel
+
+%description javahl
+This package includes the JNI bindings to the Subversion libraries.
+
 %prep
 %setup -q
 %patch1 -p1 -b .swig
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
 %patch6 -p1 -b .pie
+%patch7 -p1 -b .java
 
 rm -rf neon apr apr-util db4
 
@@ -88,16 +102,16 @@ perl -pi -e 's/\.\[5-9\]/\.\[4-9\]/' configure
 # fix shebang lines, #111498
 perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
 
-export CC=gcc CXX=g++
+export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--without-swig --with-neon=%{_prefix} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation
-make %{?_smp_mflags} all %{swigdirs} 
+make %{?_smp_mflags} all javahl %{swigdirs} 
 #make swig-pl swig-py
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make install \
+make install install-javahl \
         DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
 
 # install-swig-py install-swig-pl-lib
@@ -204,7 +218,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*::*
 %endif
 
+%files javahl
+%defattr(-,root,root,-)
+%{_libdir}/libsvnjavahl-1.*
+%{_libdir}/svn-javahl
+
 %changelog
+* Tue Mar  8 2005 Joe Orton <jorton@redhat.com> 1.1.3-4
+- add -java subpackage for javahl libraries (Anthony Green, #116202)
+
 * Fri Mar  4 2005 Joe Orton <jorton@redhat.com> 1.1.3-4
 - rebuild