From a97b2315da9dc46bafe05159b63bbf552073fa19f9042bde25fcf2f702a5335c Mon Sep 17 00:00:00 2001
From: David Anes <david.anes@suse.com>
Date: Mon, 9 May 2022 14:49:53 +0000
Subject: [PATCH] Accepting request 975856 from
 home:david.anes:branches:Java:packages

- Version bump to release 0.8.3:
  * added support for building with newer JDKs.
- Updated patches:
  * Rebased: libreadline-java-0.8.0-jdk10.patch
  * Removed: libreadline-java-0.8.0-sourcetarget.patch

OBS-URL: https://build.opensuse.org/request/show/975856
OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=33
---
 libreadline-java-0.8.0-jdk10.patch | 30 ++++++------------------------
 libreadline-java-0.8.2-src.tar.gz  |  3 ---
 libreadline-java-0.8.3-src.tar.gz  |  3 +++
 libreadline-java.changes           | 10 ++++++++++
 libreadline-java.spec              |  6 ++----
 5 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 libreadline-java-0.8.2-src.tar.gz
 create mode 100644 libreadline-java-0.8.3-src.tar.gz

diff --git a/libreadline-java-0.8.0-jdk10.patch b/libreadline-java-0.8.0-jdk10.patch
index 3054c67..96e6d97 100644
--- a/libreadline-java-0.8.0-jdk10.patch
+++ b/libreadline-java-0.8.0-jdk10.patch
@@ -1,27 +1,8 @@
-Index: libreadline-java-0.8.2/src/Makefile
+Index: libreadline-java-0.8.3/src/native/Makefile
 ===================================================================
---- libreadline-java-0.8.2.orig/src/Makefile
-+++ libreadline-java-0.8.2/src/Makefile
-@@ -2,11 +2,12 @@
- #
- 
- BUILD=../build
-+NATIVE=native
- 
--all : java native
-+all : . java native
- 
- java: always $(BUILD)
--	$(JAVAC) $(JC_FLAGS) -d $(BUILD) `find . -name "*.java"`
-+	$(JAVAC) $(JC_FLAGS) -d $(BUILD) -h $(NATIVE) `find . -name "*.java"`
- 
- native: always
- 	cd native ; $(MAKE) T_LIBS="$(T_LIBS)" JAVAINCLUDE="$(JAVAINCLUDE)" \
-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
+--- libreadline-java-0.8.3.orig/src/native/Makefile
++++ libreadline-java-0.8.3/src/native/Makefile
+@@ -132,15 +132,11 @@ endif
  getline.$(OBJ_EXT): getline.c
  	$(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) -c getline.c
  
@@ -32,9 +13,10 @@ Index: libreadline-java-0.8.2/src/native/Makefile
 +org_gnu_readline_Readline.$(OBJ_EXT): org_gnu_readline_Readline.h org_gnu_readline_Readline.c
 +	$(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) -c org_gnu_readline_Readline.c
  
+ ifeq ($(USE_JAVAH),true)
  org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class
 -	$(JAVA_HOME)/bin/javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline
 -	touch org_gnu_readline_Readline.h
+ endif
  
  clean:
- 	-rm -f org_gnu_readline_Readline.h \
diff --git a/libreadline-java-0.8.2-src.tar.gz b/libreadline-java-0.8.2-src.tar.gz
deleted file mode 100644
index d1fa4de..0000000
--- a/libreadline-java-0.8.2-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0a3d9b867e98a463e74da9cd495dcd1d6f67722bf4a40f9ce21f7df634ae234
-size 96508
diff --git a/libreadline-java-0.8.3-src.tar.gz b/libreadline-java-0.8.3-src.tar.gz
new file mode 100644
index 0000000..29ff64c
--- /dev/null
+++ b/libreadline-java-0.8.3-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57d46274b9fd18bfc5fc8b3ab751e963386144629bcfd6c66b4fae04bbf8c89f
+size 82037
diff --git a/libreadline-java.changes b/libreadline-java.changes
index 6ed45ea..b468100 100644
--- a/libreadline-java.changes
+++ b/libreadline-java.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon May  9 14:32:42 UTC 2022 - David Anes <david.anes@suse.com>
+
+- Version bump to release 0.8.3:
+  * added support for building with newer JDKs.
+
+- Updated patches:
+  * Rebased: libreadline-java-0.8.0-jdk10.patch
+  * Removed: libreadline-java-0.8.0-sourcetarget.patch
+
 -------------------------------------------------------------------
 Fri Mar 18 16:39:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/libreadline-java.spec b/libreadline-java.spec
index 4b48a4d..7df63af 100644
--- a/libreadline-java.spec
+++ b/libreadline-java.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libreadline-java
-Version:        0.8.2
+Version:        0.8.3
 Release:        0
 Summary:        Java Wrapper for the EditLine Library
 License:        LGPL-2.1-or-later
@@ -28,7 +28,6 @@ Source1:        baselibs.conf
 Patch0:         libreadline-java-ncurses.patch
 Patch1:         libreadline-java-libdir.patch
 Patch3:         libreadline-java-0.8.0-jdk10.patch
-Patch4:         libreadline-java-0.8.0-sourcetarget.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-tools
@@ -57,7 +56,6 @@ wrapper. This package contains the javadoc documentation for it.
 %patch0
 %patch1
 %patch3 -p1
-%patch4 -p1
 find . -name "*.jar" -exec rm -f {} \;
 sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java
 
@@ -87,7 +85,7 @@ cp -a api/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %license COPYING.LIB
-%doc ChangeLog NEWS README README.1st VERSION
+%doc NEWS README README.1st VERSION
 %dir %{_libdir}/%{name}
 %attr(-,root,root) %{_libdir}/%{name}/*