From 91250d98aa334e24490a872385a65e7563ad1133cda513fa9b2ee39928c3e9a2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 19:55:21 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=28 --- libreadline-java.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreadline-java.spec b/libreadline-java.spec index 991a656..e9eca73 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -1,7 +1,7 @@ # # spec file for package libreadline-java # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: libreadline-java Version: 0.8.0 Release: 0 Summary: Java Wrapper for the EditLine Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/Java Url: http://java-readline.sf.net/ Source0: http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.tar.gz From 48ac9e97f3e4bcf411a731041c3c2410c8d8b50df0de4e0253458efde9a3ea58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 3 Aug 2018 07:47:10 +0000 Subject: [PATCH 2/2] - Version bump to 0.8.2: * bugfix: using tab completion would crash the virtual machine * getVar()/setVar() (Bernhard) * unicode support (Andrew) * added bats test case and running on travis ci (Andrew) * various build fixes (Andrew) - Update URL/Source to point to current location - Refresh patches: * libreadline-java-0.8.0-jdk10.patch * libreadline-java-0.8.0-sourcetarget.patch * libreadline-java-ncurses.patch - Remove upstream merged: * libreadline-java-0.8.0-missing-return-type.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=29 --- libreadline-java-0.8.0-jdk10.patch | 27 +++++++------- ...dline-java-0.8.0-missing-return-type.patch | 13 ------- libreadline-java-0.8.0-sourcetarget.patch | 18 +++++----- libreadline-java-0.8.0-src.tar.gz | 3 -- libreadline-java-0.8.2-src.tar.gz | 3 ++ libreadline-java-ncurses.patch | 36 ++++++++++--------- libreadline-java.changes | 17 +++++++++ libreadline-java.spec | 13 +++---- 8 files changed, 69 insertions(+), 61 deletions(-) delete mode 100644 libreadline-java-0.8.0-missing-return-type.patch delete mode 100644 libreadline-java-0.8.0-src.tar.gz create mode 100644 libreadline-java-0.8.2-src.tar.gz diff --git a/libreadline-java-0.8.0-jdk10.patch b/libreadline-java-0.8.0-jdk10.patch index b7be006..3054c67 100644 --- a/libreadline-java-0.8.0-jdk10.patch +++ b/libreadline-java-0.8.0-jdk10.patch @@ -1,5 +1,7 @@ ---- libreadline-java-0.8.0/src/Makefile 2017-12-18 11:50:48.209823175 +0100 -+++ libreadline-java-0.8.0/src/Makefile 2017-12-18 11:51:06.361823244 +0100 +Index: libreadline-java-0.8.2/src/Makefile +=================================================================== +--- libreadline-java-0.8.2.orig/src/Makefile ++++ libreadline-java-0.8.2/src/Makefile @@ -2,11 +2,12 @@ # @@ -15,23 +17,24 @@ native: always cd native ; $(MAKE) T_LIBS="$(T_LIBS)" JAVAINCLUDE="$(JAVAINCLUDE)" \ ---- libreadline-java-0.8.0/src/native/Makefile 2017-12-18 11:50:48.209823175 +0100 -+++ libreadline-java-0.8.0/src/native/Makefile 2017-12-18 11:52:03.693823460 +0100 -@@ -103,14 +103,10 @@ +Index: libreadline-java-0.8.2/src/native/Makefile +=================================================================== +--- libreadline-java-0.8.2.orig/src/native/Makefile ++++ libreadline-java-0.8.2/src/native/Makefile +@@ -132,14 +132,10 @@ endif getline.$(OBJ_EXT): getline.c - $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -D$(TG) -c getline.c + $(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) -c getline.c -org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h \ -- org_gnu_readline_Readline.c -- $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -D$(TG) \ -- -c org_gnu_readline_Readline.c +- org_gnu_readline_Readline.c +- $(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) \ +- -c org_gnu_readline_Readline.c +org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h org_gnu_readline_Readline.c -+ $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -D$(TG) -c org_gnu_readline_Readline.c ++ $(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) -c org_gnu_readline_Readline.c org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class -- javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline +- $(JAVA_HOME)/bin/javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline - touch org_gnu_readline_Readline.h clean: -rm -f org_gnu_readline_Readline.h \ -Only in libreadline-java-0.8.0/src/native: Makefile.orig diff --git a/libreadline-java-0.8.0-missing-return-type.patch b/libreadline-java-0.8.0-missing-return-type.patch deleted file mode 100644 index b21ce23..0000000 --- a/libreadline-java-0.8.0-missing-return-type.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libreadline-java-0.8.0/src/native/org_gnu_readline_Readline.c -=================================================================== ---- libreadline-java-0.8.0.orig/src/native/org_gnu_readline_Readline.c -+++ libreadline-java-0.8.0/src/native/org_gnu_readline_Readline.c -@@ -430,7 +430,7 @@ const char *java_completer(char *text, i - jtext = (*jniEnv)->NewStringUTF(jniEnv,text); - - if (jniMethodId == 0) { -- return; -+ return ((const char *)NULL); - } - - completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject, diff --git a/libreadline-java-0.8.0-sourcetarget.patch b/libreadline-java-0.8.0-sourcetarget.patch index 18ee4df..1640450 100644 --- a/libreadline-java-0.8.0-sourcetarget.patch +++ b/libreadline-java-0.8.0-sourcetarget.patch @@ -1,11 +1,13 @@ ---- libreadline-java-0.8.0/Makefile 2017-12-18 11:50:48.197823175 +0100 -+++ libreadline-java-0.8.0/Makefile 2017-12-18 13:31:13.714940274 +0100 -@@ -70,7 +70,7 @@ +Index: libreadline-java-0.8.2/Makefile +=================================================================== +--- libreadline-java-0.8.2.orig/Makefile ++++ libreadline-java-0.8.2/Makefile +@@ -37,7 +37,7 @@ T_LIBS = JavaReadline ## normal javac - JAVAC = javac --JC_FLAGS = -+JC_FLAGS = -source 1.6 -target 1.6 + JAVAC = $(JAVA_HOME)/bin/javac +-JC_FLAGS += -target 1.5 -source 1.5 ++JC_FLAGS += -target 1.6 -source 1.6 + + # installation directories -------------------------------------------------- - ## with jikes - #JAVAC = jikes diff --git a/libreadline-java-0.8.0-src.tar.gz b/libreadline-java-0.8.0-src.tar.gz deleted file mode 100644 index 5c8af9b..0000000 --- a/libreadline-java-0.8.0-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890 -size 77122 diff --git a/libreadline-java-0.8.2-src.tar.gz b/libreadline-java-0.8.2-src.tar.gz new file mode 100644 index 0000000..d1fa4de --- /dev/null +++ b/libreadline-java-0.8.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0a3d9b867e98a463e74da9cd495dcd1d6f67722bf4a40f9ce21f7df634ae234 +size 96508 diff --git a/libreadline-java-ncurses.patch b/libreadline-java-ncurses.patch index a5bb02a..afab2ea 100644 --- a/libreadline-java-ncurses.patch +++ b/libreadline-java-ncurses.patch @@ -1,24 +1,26 @@ -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 +Index: src/native/Makefile +=================================================================== +--- src/native/Makefile.orig ++++ src/native/Makefile +@@ -43,10 +43,8 @@ NATIVE_CFLAGS := -fpic -DPOSIX $(CFLAGS) + LD_FLAGS = -shared + INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC) --LIBPATH = -L/usr/lib/termcap +-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@12 - else -- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ -+ $(CC) -shared $(OBJECTS) $($(TG)_LIBS) -o $@ - endif + JavaGetline_LIBS = endif +@@ -125,7 +123,7 @@ ifeq (MSWIN,$(OS_FLAVOR)) + $(CC) $(LD_FLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -Fe$@ + endif + ifeq (LINUX,$(OS_FLAVOR)) +- $(CC) $(LD_FLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ ++ $(CC) $(LD_FLAGS) $(OBJECTS) $($(TG)_LIBS) -o $@ + endif + ifeq (MAC,$(OS_FLAVOR)) + $(CC) $(LD_FLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ diff --git a/libreadline-java.changes b/libreadline-java.changes index ebe68b3..ac20971 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Aug 3 07:26:14 UTC 2018 - tchvatal@suse.com + +- Version bump to 0.8.2: + * bugfix: using tab completion would crash the virtual machine + * getVar()/setVar() (Bernhard) + * unicode support (Andrew) + * added bats test case and running on travis ci (Andrew) + * various build fixes (Andrew) +- Update URL/Source to point to current location +- Refresh patches: + * libreadline-java-0.8.0-jdk10.patch + * libreadline-java-0.8.0-sourcetarget.patch + * libreadline-java-ncurses.patch +- Remove upstream merged: + * libreadline-java-0.8.0-missing-return-type.patch + ------------------------------------------------------------------- Mon Dec 18 10:57:33 UTC 2017 - fstrba@suse.com diff --git a/libreadline-java.spec b/libreadline-java.spec index e9eca73..f5a2108 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -17,17 +17,16 @@ Name: libreadline-java -Version: 0.8.0 +Version: 0.8.2 Release: 0 Summary: Java Wrapper for the EditLine Library License: LGPL-2.1-or-later Group: Development/Libraries/Java -Url: http://java-readline.sf.net/ -Source0: http://download.sourceforge.net/java-readline/libreadline-java-0.8.0-src.tar.gz +URL: https://github.com/aclemons/java-readline +Source0: https://github.com/aclemons/java-readline/releases/download/v%{version}/%{name}-%{version}-src.tar.gz Source1: baselibs.conf Patch0: libreadline-java-ncurses.patch Patch1: libreadline-java-libdir.patch -Patch2: libreadline-java-0.8.0-missing-return-type.patch Patch3: libreadline-java-0.8.0-jdk10.patch Patch4: libreadline-java-0.8.0-sourcetarget.patch BuildRequires: fdupes @@ -57,7 +56,6 @@ wrapper. This package contains the javadoc documentation for it. %setup -q %patch0 %patch1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 find . -name "*.jar" -exec rm -f {} \; @@ -77,8 +75,6 @@ do done %install -# install jar file and JNI library under %{_libdir}/%{name} -# FIXME: fix jpackage-utils to handle multilib correctly mkdir -p %{buildroot}%{_libdir}/%{name} install -m 644 %{name}.jar \ %{buildroot}%{_libdir}/%{name}/%{name}.jar @@ -90,7 +86,8 @@ cp -a api/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -%doc ChangeLog NEWS README README.1st VERSION COPYING.LIB +%license COPYING.LIB +%doc ChangeLog NEWS README README.1st VERSION %dir %{_libdir}/%{name} %attr(-,root,root) %{_libdir}/%{name}/*