rpms/libreadline-java/devel libreadline-java-libdir.patch, NONE, 1.1 libreadline-java-ncurses.patch, NONE, 1.1

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/extras/rpms/libreadline-java/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29099

Added Files:
	libreadline-java-libdir.patch libreadline-java-ncurses.patch 
Log Message:
- Add libreadline-java-libdir.patch and libreadline-java-ncurses.patch.



libreadline-java-libdir.patch:

--- NEW FILE libreadline-java-libdir.patch ---
diff -urN ../libreadline-java-0.8.0.orig/src/org/gnu/readline/Readline.java ./src/org/gnu/readline/Readline.java
--- ../libreadline-java-0.8.0.orig/src/org/gnu/readline/Readline.java	2003-01-07 05:14:35.000000000 -0500
+++ ./src/org/gnu/readline/Readline.java	2007-07-05 16:05:25.000000000 -0400
@@ -130,8 +130,9 @@
       iLib = lib;
       return;
     }
-    System.loadLibrary(lib.getName()); // might throw UnsatisfiedLinkError
-    iLib = lib;
+    // Load Editline backing library by default.
+    System.load("@LIBDIR@/libreadline-java/libJavaEditline.so");
+    iLib = ReadlineLibrary.Editline;
   }
 
   /////////////////////////////////////////////////////////////////////////////

libreadline-java-ncurses.patch:

--- NEW FILE libreadline-java-ncurses.patch ---
diff -urN ../libreadline-java-0.8.0.orig/src/native/Makefile ./src/native/Makefile
--- ../libreadline-java-0.8.0.orig/src/native/Makefile	2003-01-07 05:14:35.000000000 -0500
+++ ./src/native/Makefile	2007-07-05 13:54:47.000000000 -0400
@@ -45,9 +45,8 @@
 CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
 else
 INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVANATINC)
-LIBPATH           = -L/usr/lib/termcap 
-JavaReadline_LIBS = -lreadline -ltermcap -lhistory
-JavaEditline_LIBS = -ledit -ltermcap
+JavaReadline_LIBS = -lreadline -ltinfo -lhistory
+JavaEditline_LIBS = -ledit -lncurses
 ifeq (cygwin,$(WIN32))
 JavaGetline_LIBS = -lcygwin
 endif
@@ -97,7 +96,7 @@
 	$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
 		$(OBJECTS) -W1,-e,_readline_init at 12
 else
-	$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+	$(CC) -shared $(OBJECTS) $($(TG)_LIBS) -o $@
 endif
 endif