- fix javahl compile failure
This commit is contained in:
jorton
parent
49171962ae
commit
926d203eab
@ -1,6 +1,6 @@
|
||||
--- 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,
|
||||
--- subversion-1.4.3/build/ac-macros/java.m4.java
|
||||
+++ subversion-1.4.3/build/ac-macros/java.m4
|
||||
@@ -82,7 +82,7 @@
|
||||
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
|
||||
@ -9,3 +9,25 @@
|
||||
fi
|
||||
AC_MSG_RESULT([$JDK_SUITABLE])
|
||||
|
||||
--- subversion-1.4.3/Makefile.in.java
|
||||
+++ subversion-1.4.3/Makefile.in
|
||||
@@ -343,7 +343,7 @@
|
||||
exit 1; \
|
||||
fi
|
||||
@FIX_JAVAHL_LIB@
|
||||
- $(JAVA) -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) org.tigris.subversion.javahl.tests.BasicTests
|
||||
+ $(JAVA) -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH) org.tigris.subversion.javahl.tests.BasicTests
|
||||
|
||||
# "make check CLEANUP=true" will clean up directories for successful tests.
|
||||
# "make check TESTS=subversion/tests/cmdline/basic_tests.py"
|
||||
--- subversion-1.4.3/build-outputs.mk.java
|
||||
+++ subversion-1.4.3/build-outputs.mk
|
||||
@@ -347,7 +347,7 @@
|
||||
javahl-java: $(javahl_java_DEPS)
|
||||
javahl_java_SRC = $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/DirEntry.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/ChangePath.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/LockStatus.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PromptUserPassword2.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Lock.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Info.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNInputStream.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify2.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/BlameCallback.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PromptUserPassword3.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/CommitMessage.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PromptUserPassword.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClientLogLevel.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Revision.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/PropertyData.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/CommitItem.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/LogMessage.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/StatusKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NodeKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Info2.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/OutputInterface.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NotifyAction.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NotifyStatus.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NativeResources.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNOutputStream.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Status.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/RevisionKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/ScheduleKind.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Path.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Version.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/JNIError.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/ClientException.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/NotifyInformation.java $(abs_srcdir)/subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/InputInterface.java
|
||||
$(javahl_java_OBJECTS): $(javahl_java_SRC)
|
||||
- $(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/java/javahl/classes -classpath subversion/bindings/java/javahl/classes:$(javahl_java_CLASSPATH) $(javahl_java_SRC)
|
||||
+ $(COMPILE_JAVAHL_JAVAC) -d subversion/bindings/java/javahl/classes -classpath subversion/bindings/java/javahl/classes $(javahl_java_SRC)
|
||||
|
||||
|
||||
javahl_javah_PATH = subversion/bindings/java/javahl/include
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
Summary: Modern Version Control System designed to replace CVS
|
||||
Name: subversion
|
||||
Version: 1.4.3
|
||||
Release: 3
|
||||
Release: 4
|
||||
License: BSD
|
||||
Group: Development/Tools
|
||||
URL: http://subversion.tigris.org/
|
||||
@ -260,6 +260,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Mar 29 2007 Joe Orton <jorton@redhat.com> 1.4.3-4
|
||||
- fix javahl compile failure
|
||||
|
||||
* Mon Jan 29 2007 Joe Orton <jorton@redhat.com> 1.4.3-3
|
||||
- update to 1.4.3 (#228691)
|
||||
- remove trailing dot from Summary
|
||||
|
||||
Loading…
Reference in New Issue
Block a user