From 10792a3143897b4f692a5434386d2cba3460103b Mon Sep 17 00:00:00 2001 From: sbluhm Date: Wed, 29 Sep 2021 09:12:10 +0200 Subject: [PATCH 1/2] - Re-added module-info.java. - Force Java 11 on RHEL build. --- xmlpull.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xmlpull.spec b/xmlpull.spec index dd83fe5..ba6d322 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 @@ -29,12 +29,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 +45,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 From 46e5c26bb5ae89d290364e8d83e7edc0697d8a28 Mon Sep 17 00:00:00 2001 From: sbluhm Date: Wed, 29 Sep 2021 14:31:11 +0200 Subject: [PATCH 2/2] Added java-11-devel build requirement --- xmlpull.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmlpull.spec b/xmlpull.spec index ba6d322..bb70fdc 100644 --- a/xmlpull.spec +++ b/xmlpull.spec @@ -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) @@ -33,7 +34,7 @@ find \( -name \*.jar -o -name \*.class \) -delete %build %if 0%{?rhel} -export JAVA_HOME=/usr/lib/jvm/java-11 +export JAVA_HOME=/usr/lib/jvm/java-11 %endif %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8