diff --git a/JPype1-java8compat.patch b/JPype1-java8compat.patch new file mode 100644 index 0000000..60167ff --- /dev/null +++ b/JPype1-java8compat.patch @@ -0,0 +1,63 @@ +Only in JPype1-1.4.1: JPype1-java8compat.patch +--- JPype1-1.4.1/native/build.xml 2020-07-17 00:34:07.000000000 +0200 ++++ JPype1-1.4.1/native/build.xml 2023-06-12 11:24:36.344297754 +0200 +@@ -1,7 +1,7 @@ + + + +- ++ + + + +@@ -16,6 +16,7 @@ + + +@@ -23,6 +24,7 @@ + + +--- JPype1-1.4.1/test/build.xml 2020-07-17 00:34:07.000000000 +0200 ++++ JPype1-1.4.1/test/build.xml 2023-06-12 12:47:52.223097870 +0200 +@@ -20,8 +20,6 @@ + + + + + +@@ -34,8 +32,9 @@ + + + + + +@@ -47,8 +46,9 @@ + + + diff --git a/python-JPype1.changes b/python-JPype1.changes index ee6c445..7812e36 100644 --- a/python-JPype1.changes +++ b/python-JPype1.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 12 11:00:29 UTC 2023 - Fridrich Strba + +- Do not hardcode java-15-openjdk, since this can be built with + any Java >= 9 +- Added patch: + * JPype1-java8compat.patch + + Build packages that are fully backward compatible to Java 8 + ------------------------------------------------------------------- Tue Mar 7 00:25:49 UTC 2023 - John Vandenberg diff --git a/python-JPype1.spec b/python-JPype1.spec index 455ac7f..9273a6e 100644 --- a/python-JPype1.spec +++ b/python-JPype1.spec @@ -29,14 +29,16 @@ Summary: Python to Java bridge License: Apache-2.0 URL: https://github.com/jpype-project/jpype Source: https://files.pythonhosted.org/packages/source/J/JPype1/JPype1-%{version}.tar.gz +Patch0: JPype1-java8compat.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: ant BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: java-15-openjdk-devel +BuildRequires: java-devel >= 9 +BuildRequires: javapackages-tools BuildRequires: python-rpm-macros -Requires: java-15-openjdk-headless +Requires: java-headless >= 1.8 Recommends: python-numpy Suggests: python-typing_extensions ExcludeArch: %{ix86} armv7 @@ -60,6 +62,7 @@ A Python to Java bridge. %prep %setup -q -n JPype1-%{version} +%patch0 -p1 # Avoid build dependency on PyInstaller rm jpype/_pyinstaller/test_jpype_pyinstaller.py