From 8c701b6e436693fa66cbbe5a73eef40d07c4043f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 21 Feb 2008 12:20:21 +0000 Subject: [PATCH] Correct jar location (#433295) --- subversion-1.4.6-javadir.patch | 19 +++++++++++++++++++ subversion.spec | 11 ++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 subversion-1.4.6-javadir.patch diff --git a/subversion-1.4.6-javadir.patch b/subversion-1.4.6-javadir.patch new file mode 100644 index 0000000..0632739 --- /dev/null +++ b/subversion-1.4.6-javadir.patch @@ -0,0 +1,19 @@ +Make it possible for %install to specify %_javadir as destination +Lubomir Kundrak + +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@ diff --git a/subversion.spec b/subversion.spec index ee56c96..4ca4923 100644 --- a/subversion.spec +++ b/subversion.spec @@ -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 @@ Patch6: subversion-1.0.3-pie.patch 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 @@ This package includes the Ruby bindings to the Subversion libraries. %endif %patch8 -p1 -b .macropen %patch9 -p1 -b .swig133 +%patch10 -p1 -b .javadir %build ./autogen.sh @@ -145,7 +147,7 @@ rm -rf ${RPM_BUILD_ROOT} 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 @@ rm -rf ${RPM_BUILD_ROOT} %files javahl %defattr(-,root,root,-) %{_libdir}/libsvnjavahl-1.* -%{_libdir}/svn-javahl +%{_javadir}/svn-javahl.jar %endif %changelog +* Thu Feb 21 2008 Lubomir Kundrak 1.4.6-5 +- Correct install location of java stuff (#433295) + * Wed Feb 6 2008 Tom "spot" Callaway 1.4.6-4 - BR perl(ExtUtils::Embed)