diff --git a/libreadline-java.changes b/libreadline-java.changes index f074271..0d4d8d5 100644 --- a/libreadline-java.changes +++ b/libreadline-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 9 11:06:12 UTC 2017 - tchvatal@suse.com + +- Require java 1.6.0 or newer to build as gcj won't compile us + ------------------------------------------------------------------- Tue Jul 8 10:14:12 UTC 2014 - tchvatal@suse.com diff --git a/libreadline-java.spec b/libreadline-java.spec index 1c8664b..acb25d7 100644 --- a/libreadline-java.spec +++ b/libreadline-java.spec @@ -1,7 +1,7 @@ # # spec file for package libreadline-java # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -28,11 +28,12 @@ Source1: baselibs.conf Patch0: libreadline-java-ncurses.patch Patch1: libreadline-java-libdir.patch Patch2: libreadline-java-0.8.0-missing-return-type.patch -BuildRequires: java-devel +BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-tools BuildRequires: libedit-devel >= 2.9 BuildRequires: ncurses-devel -Requires: java >= 1.4.2 +BuildRequires: zlib-devel +Requires: java Requires: libedit >= 2.9 Provides: gnu.readline Provides: java_readline @@ -72,9 +73,6 @@ do done %install -%if 0%{?suse_version} == 1110 -export NO_BRP_CHECK_BYTECODE_VERSION=true -%endif # install jar file and JNI library under %{_libdir}/%{name} # FIXME: fix jpackage-utils to handle multilib correctly mkdir -p %{buildroot}%{_libdir}/%{name}