rpms/subversion/devel subversion-1.4.6-javadir.patch, NONE, 1.1 subversion.spec, 1.107, 1.108

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/subversion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7416

Modified Files:
	subversion.spec 
Added Files:
	subversion-1.4.6-javadir.patch 
Log Message:
Correct jar location (#433295)

subversion-1.4.6-javadir.patch:

--- NEW FILE subversion-1.4.6-javadir.patch ---
Make it possible for %install to specify %_javadir as destination
Lubomir Kundrak <lkundrak at redhat.com>

diff -urp subversion-1.4.6.orig/Makefile.in subversion-1.4.6/Makefile.in
--- subversion-1.4.6.orig/Makefile.in	2008-02-21 11:05:31.000000000 +0100
+++ subversion-1.4.6/Makefile.in	2008-02-21 11:05:15.000000000 +0100
@@ -71,9 +71,9 @@ swig_pydir_extra = @libdir@/svn-python/s
 swig_pldir = @libdir@/svn-perl
 swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
 
-javahl_javadir = @libdir@/svn-javahl
-javahl_javahdir = @libdir@/svn-javahl/include
-javahl_libdir = @libdir@
+javahl_javadir ?= @libdir@/svn-javahl
+javahl_javahdir ?= @libdir@/svn-javahl/include
+javahl_libdir ?= @libdir@
 
 MSGFMT = @MSGFMT@
 MSGFMTFLAGS = @MSGFMTFLAGS@


Index: subversion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- subversion.spec	6 Feb 2008 14:12:46 -0000	1.107
+++ subversion.spec	21 Feb 2008 12:20:21 -0000	1.108
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.6
-Release: 4
+Release: 5
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -29,6 +29,7 @@
 Patch7: subversion-1.1.3-java.patch
 Patch8: subversion-1.4.4-macropen.patch
 Patch9: subversion-1.4.4-swig1333.patch
+Patch10: subversion-1.4.6-javadir.patch
 BuildRequires: autoconf, libtool, python, python-devel, texinfo, which
 BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, gettext
 BuildRequires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
@@ -112,6 +113,7 @@
 %endif
 %patch8 -p1 -b .macropen
 %patch9 -p1 -b .swig133
+%patch10 -p1 -b .javadir
 
 %build
 ./autogen.sh
@@ -145,7 +147,7 @@
 make install install-swig-py install-swig-pl-lib install-swig-rb \
         DESTDIR=$RPM_BUILD_ROOT %{swigdirs}
 %if %{with_java}
-make install-javahl DESTDIR=$RPM_BUILD_ROOT
+make install-javahl-java install-javahl-lib javahl_javadir=%{_javadir} DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 make pure_vendor_install -C subversion/bindings/swig/perl/native \
@@ -272,10 +274,13 @@
 %files javahl
 %defattr(-,root,root,-)
 %{_libdir}/libsvnjavahl-1.*
-%{_libdir}/svn-javahl
+%{_javadir}/svn-javahl.jar
 %endif
 
 %changelog
+* Thu Feb 21 2008 Lubomir Kundrak <lkundrak at redhat.com> 1.4.6-5
+- Correct install location of java stuff (#433295)
+
 * Wed Feb  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4.6-4
 - BR perl(ExtUtils::Embed)