From 627403f595063b0bcbdfc2b9cf69158148f9c6c29c4be09d7c66ecffc3b7d1b3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 18 Dec 2017 11:01:00 +0000 Subject: [PATCH 1/4] Fix build with jdk10 OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=23 --- libreadline-java-0.8.0-jdk10.patch | 37 ++++++++++++++++++++++++++++++ libreadline-java.changes | 8 +++++++ libreadline-java.spec | 7 +++--- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 libreadline-java-0.8.0-jdk10.patch diff --git a/libreadline-java-0.8.0-jdk10.patch b/libreadline-java-0.8.0-jdk10.patch new file mode 100644 index 0000000..b7be006 --- /dev/null +++ b/libreadline-java-0.8.0-jdk10.patch @@ -0,0 +1,37 @@ +--- 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 +@@ -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)" \ +--- 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 @@ + getline.$(OBJ_EXT): getline.c + $(CC) $(INCLUDES) $(CPPFLAGS) $(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.$(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.h: $(BUILDDIR)/org/gnu/readline/Readline.class +- 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.changes b/libreadline-java.changes index 2cffd87..e0efb76 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 18 10:57:33 UTC 2017 - fstrba@suse.com + +- Added patch: + * libreadline-java-0.8.0-jdk10.patch + - Allow building with jdk10 that does not have javah +- Run fdupes on documentation + ------------------------------------------------------------------- Mon Sep 18 12:42:17 UTC 2017 - fstrba@suse.com diff --git a/libreadline-java.spec b/libreadline-java.spec index acb25d7..0029cda 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -28,6 +28,8 @@ 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 +BuildRequires: fdupes BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-tools BuildRequires: libedit-devel >= 2.9 @@ -37,7 +39,6 @@ Requires: java Requires: libedit >= 2.9 Provides: gnu.readline Provides: java_readline -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libreadline-java provides Java bindings for libedit though a JNI @@ -56,6 +57,7 @@ wrapper. This package contains the javadoc documentation for it. %patch0 %patch1 %patch2 -p1 +%patch3 -p1 find . -name "*.jar" -exec rm -f {} \; sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java @@ -83,15 +85,14 @@ install -m 755 libJavaEditline.so %{buildroot}%{_libdir}/%{name} # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -a api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -%defattr(0644,root,root,0755) %doc ChangeLog NEWS README README.1st VERSION COPYING.LIB %dir %{_libdir}/%{name} %attr(-,root,root) %{_libdir}/%{name}/* %files javadoc -%defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name} %changelog From 767f01313e026aac80052670cae393a94d97211bda5b9ff22a6d2bdb711ec5d1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 18 Dec 2017 11:10:34 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=24 --- libreadline-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreadline-java.spec b/libreadline-java.spec index 0029cda..c584b34 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -30,7 +30,7 @@ Patch1: libreadline-java-libdir.patch Patch2: libreadline-java-0.8.0-missing-return-type.patch Patch3: libreadline-java-0.8.0-jdk10.patch BuildRequires: fdupes -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: libedit-devel >= 2.9 BuildRequires: ncurses-devel From a9a39fc06d7c290419d38074b154731ae090b06ce649e9cba126959bb3e34337 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 18 Dec 2017 12:34:08 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=25 --- libreadline-java-0.8.0-sourcetarget.patch | 11 +++++++++++ libreadline-java.changes | 1 + libreadline-java.spec | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 libreadline-java-0.8.0-sourcetarget.patch diff --git a/libreadline-java-0.8.0-sourcetarget.patch b/libreadline-java-0.8.0-sourcetarget.patch new file mode 100644 index 0000000..18ee4df --- /dev/null +++ b/libreadline-java-0.8.0-sourcetarget.patch @@ -0,0 +1,11 @@ +--- 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 @@ + + ## normal javac + JAVAC = javac +-JC_FLAGS = ++JC_FLAGS = -source 1.6 -target 1.6 + + ## with jikes + #JAVAC = jikes diff --git a/libreadline-java.changes b/libreadline-java.changes index e0efb76..9feec39 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -5,6 +5,7 @@ Mon Dec 18 10:57:33 UTC 2017 - fstrba@suse.com * libreadline-java-0.8.0-jdk10.patch - Allow building with jdk10 that does not have javah - Run fdupes on documentation +- Build with source and target level 1.6 ------------------------------------------------------------------- Mon Sep 18 12:42:17 UTC 2017 - fstrba@suse.com diff --git a/libreadline-java.spec b/libreadline-java.spec index c584b34..991a656 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -29,6 +29,7 @@ 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 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools @@ -58,6 +59,7 @@ wrapper. This package contains the javadoc documentation for it. %patch1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 find . -name "*.jar" -exec rm -f {} \; sed -i 's|@LIBDIR@|%{_libdir}|' src/org/gnu/readline/Readline.java From 8f4b369e70aab677c15c97a5f479a5555e3cc6983bf4f1ca46b5072ae89bfea9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 18 Dec 2017 13:50:53 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/libreadline-java?expand=0&rev=26 --- libreadline-java.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libreadline-java.changes b/libreadline-java.changes index 9feec39..ebe68b3 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -4,8 +4,9 @@ Mon Dec 18 10:57:33 UTC 2017 - fstrba@suse.com - Added patch: * libreadline-java-0.8.0-jdk10.patch - Allow building with jdk10 that does not have javah + * libreadline-java-0.8.0-sourcetarget.patch + - Build with source and target level 1.6 - Run fdupes on documentation -- Build with source and target level 1.6 ------------------------------------------------------------------- Mon Sep 18 12:42:17 UTC 2017 - fstrba@suse.com