diff --git a/jython.changes b/jython.changes index 083d8ea..040d9bb 100644 --- a/jython.changes +++ b/jython.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 12 13:35:57 UTC 2019 - Fridrich Strba + +- Build against jline1, a compatibility package + ------------------------------------------------------------------- Fri Nov 23 09:23:44 UTC 2018 - Fridrich Strba diff --git a/jython.spec b/jython.spec index 57b296a..d743687 100644 --- a/jython.spec +++ b/jython.spec @@ -1,7 +1,7 @@ # # spec file for package jython # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -53,7 +53,7 @@ BuildRequires: fdupes BuildRequires: jakarta-oro BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: jline +BuildRequires: jline1 BuildRequires: libreadline-java >= 0.8.0 BuildRequires: mysql-connector-java BuildRequires: python >= %{cpython_version} @@ -62,7 +62,7 @@ BuildRequires: servletapi5 Requires: jakarta-oro Requires: java >= 1.8 Requires: javapackages-local -Requires: jline +Requires: jline1 Requires: libreadline-java >= 0.8.0 Requires: python >= %{cpython_version} Requires: servletapi5 @@ -177,7 +177,7 @@ development and in shipping products. %patch9 -p1 %build -export CLASSPATH=$(build-classpath mysql-connector-java oro servlet jline) +export CLASSPATH=$(build-classpath mysql-connector-java oro servlet jline1) # FIXME: fix jpackage-utils to handle multilib correctly export CLASSPATH=$CLASSPATH:%{_libdir}/libreadline-java/libreadline-java.jar