diff --git a/xmlpull.spec b/xmlpull.spec index dd83fe5..bb70fdc 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -1,6 +1,6 @@ Name: xmlpull Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: XML Pull Parsing API License: Public Domain @@ -8,6 +8,7 @@ URL: https://github.com/xmlpull-xpp3/%{name}-xpp3 Source0: %{url}/archive/%{name}-xpp3-parent-%{version}.tar.gz BuildArch: noarch +BuildRequires: java-11-devel BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -29,12 +30,12 @@ find \( -name \*.jar -o -name \*.class \) -delete %pom_disable_module xpp3_min -# using java 8, we need to remove the java module -rm xmlpull/src/main/java/module-info.java - %mvn_package :%{name}-xpp3-parent __noinstall %build +%if 0%{?rhel} +export JAVA_HOME=/usr/lib/jvm/java-11 +%endif %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install @@ -45,5 +46,9 @@ rm xmlpull/src/main/java/module-info.java %doc %{name}/README.adoc %changelog +* Wed Sep 29 07:07:25 UTC 2021 - Stefan Bluhm - 1.2.0-2 +- Re-added module-info.java. +- Force Java 11 on RHEL build. + * Wed Aug 11 2021 Didik Supriadi - 1.2.0-1 - Initial package