rpms/subversion
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Correct jar location (#433295)

Browse Source
This commit is contained in:
Lubomir Rintel 2008-02-21 12:20:21 +00:00
parent 3a41c5706e
commit 8c701b6e43
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
subversion-1.4.6-javadir.patch Normal file
View File

@ -0,0 +1,19 @@
Make it possible for %install to specify %_javadir as destination
Lubomir Kundrak <lkundrak@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@

11
subversion.spec
View File

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