diff --git a/libdb-4_8.spec b/libdb-4_8.spec index 9fb5706..c0c59d8 100644 --- a/libdb-4_8.spec +++ b/libdb-4_8.spec @@ -1,7 +1,7 @@ # # spec file for package libdb-4_8 # -# 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 diff --git a/libdb_java-4_8-fix-java10-comp.patch b/libdb_java-4_8-fix-java10-comp.patch new file mode 100644 index 0000000..78c1dbd --- /dev/null +++ b/libdb_java-4_8-fix-java10-comp.patch @@ -0,0 +1,13 @@ +Index: db-4.8.30/dist/configure.ac +=================================================================== +--- db-4.8.30.orig/dist/configure.ac ++++ db-4.8.30/dist/configure.ac +@@ -416,7 +416,7 @@ if test "$db_cv_java" = "yes"; then + esac + AC_MSG_RESULT($JAVA_VERSION) + case "$JAVA_VERSION" in +- 1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* ) ;; ++ 1.[[3456789]]* | 1.[[1-9]][[0-9]]* | [[23456789]]* | 10-* ) ;; + * ) + AC_MSG_ERROR([Java version 1.3 or higher required, got $JAVA_VERSION]) ;; + esac diff --git a/libdb_java-4_8.changes b/libdb_java-4_8.changes index f29b9d8..929c758 100644 --- a/libdb_java-4_8.changes +++ b/libdb_java-4_8.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 9 13:26:27 UTC 2018 - pmonrealgonzalez@suse.com + +- Added libdb_java-4_8-fix-java10-comp.patch to fix the build with + Java 10 (10-internal) + ------------------------------------------------------------------- Wed Oct 18 07:00:16 UTC 2017 - jayvdb@gmail.com diff --git a/libdb_java-4_8.spec b/libdb_java-4_8.spec index b287750..f093b0d 100644 --- a/libdb_java-4_8.spec +++ b/libdb_java-4_8.spec @@ -1,7 +1,7 @@ # # spec file for package libdb_java-4_8 # -# 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 @@ -30,6 +30,8 @@ Source: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: %{name}.changes Source9: getpatches Patch0: db-%{version}.patch +# PATCH-FIX-OPENSUSE Fix compilation with Java 10 (10-internal) +Patch1: libdb_java-4_8-fix-java10-comp.patch BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: java-sdk >= 1.5 @@ -60,6 +62,7 @@ These are the development files. %prep %setup -q -n %{generic_name}-%{version} %patch0 +%patch1 -p1 %build cd dist