Accepting request 976418 from Java:packages

0.8.3

OBS-URL: https://build.opensuse.org/request/show/976418
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreadline-java?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2022-05-14 20:51:53 +00:00 committed by Git OBS Bridge
commit 82bd4f7d78
6 changed files with 21 additions and 44 deletions

View File

@ -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.3.orig/src/native/Makefile
+++ libreadline-java-0.8.2/src/Makefile +++ libreadline-java-0.8.3/src/native/Makefile
@@ -2,11 +2,12 @@ @@ -132,15 +132,11 @@ endif
#
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
getline.$(OBJ_EXT): getline.c getline.$(OBJ_EXT): getline.c
$(CC) $(INCLUDES) $(CPPFLAGS) $(NATIVE_CFLAGS) -D$(TG) -c 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 +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 + $(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 org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class
- $(JAVA_HOME)/bin/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 - touch org_gnu_readline_Readline.h
endif
clean: clean:
-rm -f org_gnu_readline_Readline.h \

View File

@ -1,13 +0,0 @@
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 = $(JAVA_HOME)/bin/javac
-JC_FLAGS += -target 1.5 -source 1.5
+JC_FLAGS += -target 1.8 -source 1.8
# installation directories --------------------------------------------------

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0a3d9b867e98a463e74da9cd495dcd1d6f67722bf4a40f9ce21f7df634ae234
size 96508

BIN
libreadline-java-0.8.3-src.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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> Fri Mar 18 16:39:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -17,7 +17,7 @@
Name: libreadline-java Name: libreadline-java
Version: 0.8.2 Version: 0.8.3
Release: 0 Release: 0
Summary: Java Wrapper for the EditLine Library Summary: Java Wrapper for the EditLine Library
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -28,7 +28,6 @@ Source1: baselibs.conf
Patch0: libreadline-java-ncurses.patch Patch0: libreadline-java-ncurses.patch
Patch1: libreadline-java-libdir.patch Patch1: libreadline-java-libdir.patch
Patch3: libreadline-java-0.8.0-jdk10.patch Patch3: libreadline-java-0.8.0-jdk10.patch
Patch4: libreadline-java-0.8.0-sourcetarget.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
@ -57,7 +56,6 @@ wrapper. This package contains the javadoc documentation for it.
%patch0 %patch0
%patch1 %patch1
%patch3 -p1 %patch3 -p1
%patch4 -p1
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java
@ -87,7 +85,7 @@ cp -a api/* %{buildroot}%{_javadocdir}/%{name}
%files %files
%license COPYING.LIB %license COPYING.LIB
%doc ChangeLog NEWS README README.1st VERSION %doc NEWS README README.1st VERSION
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%attr(-,root,root) %{_libdir}/%{name}/* %attr(-,root,root) %{_libdir}/%{name}/*