diff --git a/0002-More-adapt-build-javac-1.8.patch b/0002-More-adapt-build-javac-1.8.patch new file mode 100644 index 0000000..f6ffdcb --- /dev/null +++ b/0002-More-adapt-build-javac-1.8.patch @@ -0,0 +1,15 @@ +diff --git a/build.xml b/build.xml +index cd7c2ed..f86b76a 100644 +--- a/build.xml ++++ b/build.xml +@@ -47,8 +47,8 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- +- ++ ++ + + + diff --git a/jdom2.spec b/jdom2.spec index 28ebe6c..1869aa3 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -17,6 +17,7 @@ Source4: generate-tarball.sh # Disable gpg signatures # Process contrib and junit pom files Patch0: 0001-Adapt-build.patch +Patch1: 0002-More-adapt-build-javac-1.8.patch BuildRequires: javapackages-local BuildRequires: ant @@ -51,6 +52,7 @@ This package contains javadoc for %{name}. %setup -q -n jdom-JDOM-%{version} %patch0 -p1 +%patch1 -p1 cp -p %{SOURCE1} maven/contrib.pom cp -p %{SOURCE2} maven/junit.pom @@ -88,6 +90,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* Sun Jul 19 2020 Fabio Valentini - 2.0.6-18 +- Set javac source and target to 1.8 to fix Java 11 builds. + * Fri Jul 10 2020 Jiri Vanek - 2.0.6-17 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11