From ce75f111dd6558c409f98e8b1457669b85a73571 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 11:57:40 +0000 Subject: [PATCH] import maven-3.8.5-4.module+el8.8.0+18044+0a924b8f --- SPECS/maven.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/SPECS/maven.spec b/SPECS/maven.spec index d72da3b..b184e14 100644 --- a/SPECS/maven.spec +++ b/SPECS/maven.spec @@ -7,7 +7,7 @@ Name: maven Epoch: 1 Version: 3.8.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java project management and project comprehension tool # maven itself is ASL 2.0 # bundled slf4j is MIT @@ -116,7 +116,8 @@ Summary: OpenJDK 8 binding for Maven RemovePathPostfixes: -openjdk8 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Requires: maven = %{epoch}:%{version}-%{release} -Requires: java-1.8.0-openjdk-devel +Requires: java-1.8.0-openjdk-headless +Recommends: java-1.8.0-openjdk-devel Conflicts: maven-jdk-binding %description openjdk8 @@ -127,7 +128,8 @@ Summary: OpenJDK 11 binding for Maven RemovePathPostfixes: -openjdk11 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Requires: maven = %{epoch}:%{version}-%{release} -Requires: java-11-openjdk-devel +Requires: java-11-openjdk-headless +Recommends: java-11-openjdk-devel Conflicts: maven-jdk-binding %description openjdk11 @@ -138,7 +140,8 @@ Summary: OpenJDK 17 binding for Maven RemovePathPostfixes: -openjdk17 Provides: maven-jdk-binding = %{epoch}:%{version}-%{release} Requires: maven = %{epoch}:%{version}-%{release} -Requires: java-17-openjdk-devel +Requires: java-17-openjdk-headless +Recommends: java-17-openjdk-devel Conflicts: maven-jdk-binding %description openjdk17 @@ -250,9 +253,9 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v # JDK bindings install -d -m 755 %{buildroot}%{_javaconfdir}/ -echo JAVA_HOME=%{_jvmlibdir}/java-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8 -echo JAVA_HOME=%{_jvmlibdir}/java-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11 -echo JAVA_HOME=%{_jvmlibdir}/java-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17 +echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8 +echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11 +echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17 %post @@ -299,6 +302,10 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi %config %{_javaconfdir}/maven.conf-openjdk17 %changelog +* Thu Feb 02 2023 Mikolaj Izdebski - 1:3.8.5-4 +- Turn hard dependency on java-devel into a weak dependencny +- Resolves: rhbz#2165591 + * Thu Jul 21 2022 Fedora Release Engineering - 1:3.8.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild