From a045e9478632cf5ebbb756e61acc2b4c4264e22a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 6 Aug 2025 10:32:44 +0200 Subject: [PATCH] Update to version 3.3.6 --- sources | 2 +- voms-clients-java.spec | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sources b/sources index b4e4f9c..6fa7c95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.5.tar.gz) = 4b470ed835036a5f2d554e64ae173e7a72b15d6abb9bdc2f2a605d95f677d9740ac193955e0334f6eef13ab1a3254dfaad7712907df9f846e9d75d6fe68d1b75 +SHA512 (voms-clients-java-3.3.6.tar.gz) = b0ee2a09e7e4001e23f5afd48e07c410a75d08eea3fe62377afce489e1e8058e90ff46e7869ba1afff636969b498b1f1002d14ea6a077cfe24f98a979842542d diff --git a/voms-clients-java.spec b/voms-clients-java.spec index fd9b0da..7340759 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java -Version: 3.3.5 -Release: 5%{?dist} +Version: 3.3.6 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -10,19 +10,24 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch +%if %{?fedora}%{!?fedora:0} >= 43 BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 +%else +BuildRequires: maven-local +%endif +BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.6 BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: asciidoctor -Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 +Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.6 %if %{?rhel}%{!?rhel:0} == 9 -Requires: (java-headless or java-11-headless or java-17-headless or java-21-headless) -Suggests: java-headless +Requires: (java-headless or java-1.8.0-headless or java-11-headless or java-17-headless or java-21-headless or java-25-headless) %else -Requires: java-25-headless +Requires: (java-headless or java-21-headless or java-25-headless) %endif +Suggests: java-headless +Requires: javapackages-tools Requires(post): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives @@ -60,12 +65,6 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. # Run asciidoctor explicitly in the build section instead %pom_remove_plugin org.asciidoctor:asciidoctor-maven-plugin -%if %{?rhel}%{!?rhel:0} == 9 -# Default build JDK in RHEL 9 is 11 -%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source/text()" 11 -%pom_xpath_replace "//pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target/text()" 11 -%endif - %build %mvn_build -j @@ -168,6 +167,9 @@ fi %license LICENSE %changelog +* Wed Aug 06 2025 Mattias Ellert - 3.3.6-1 +- Update to version 3.3.6 + * Mon Jul 28 2025 jiri vanek - 3.3.5-5 - Rebuilt for java-25-openjdk as preffered jdk