Hello community, here is the log from the commit of package libreadline-java for openSUSE:Factory checked in at 2018-08-07 10:49:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreadline-java (Old) and /work/SRC/openSUSE:Factory/.libreadline-java.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreadline-java" Tue Aug 7 10:49:43 2018 rev:30 rq:627287 version:0.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreadline-java/libreadline-java.changes 2017-12-22 12:16:58.943570633 +0100 +++ /work/SRC/openSUSE:Factory/.libreadline-java.new/libreadline-java.changes 2018-08-07 10:49:48.700553783 +0200 @@ -1,0 +2,17 @@ +Fri Aug 3 07:26:14 UTC 2018 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- libreadline-java-0.8.0-missing-return-type.patch libreadline-java-0.8.0-src.tar.gz New: ---- libreadline-java-0.8.2-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreadline-java.spec ++++++ --- /var/tmp/diff_new_pack.NbQyM7/_old 2018-08-07 10:49:49.124554542 +0200 +++ /var/tmp/diff_new_pack.NbQyM7/_new 2018-08-07 10:49:49.132554556 +0200 @@ -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 @@ -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+ +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 @@ %setup -q %patch0 %patch1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 find . -name "*.jar" -exec rm -f {} \; @@ -77,8 +75,6 @@ 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 @@ %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}/* ++++++ libreadline-java-0.8.0-jdk10.patch ++++++ --- /var/tmp/diff_new_pack.NbQyM7/_old 2018-08-07 10:49:49.168554620 +0200 +++ /var/tmp/diff_new_pack.NbQyM7/_new 2018-08-07 10:49:49.168554620 +0200 @@ -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 ++++++ libreadline-java-0.8.0-sourcetarget.patch ++++++ --- /var/tmp/diff_new_pack.NbQyM7/_old 2018-08-07 10:49:49.176554635 +0200 +++ /var/tmp/diff_new_pack.NbQyM7/_new 2018-08-07 10:49:49.176554635 +0200 @@ -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 ++++++ libreadline-java-0.8.0-src.tar.gz -> libreadline-java-0.8.2-src.tar.gz ++++++ ++++ 6061 lines of diff (skipped) ++++++ libreadline-java-ncurses.patch ++++++ --- /var/tmp/diff_new_pack.NbQyM7/_old 2018-08-07 10:49:49.260554785 +0200 +++ /var/tmp/diff_new_pack.NbQyM7/_new 2018-08-07 10:49:49.260554785 +0200 @@ -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 + JavaGetline_LIBS = 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 $@ + +@@ -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 $@
