sources

@@ -1 +1 @@
-SHA512 (voms-clients-java-3.3.7.tar.gz) = 7ed80d50ec844a93fa6f566523fb64dc0b37b7163501bd30029a6ed7bf1d01103fc753daf438405b645c1e8b501846297cc705893fced23e270f31f7b89e7eda
+SHA512 (voms-clients-java-3.3.5.tar.gz) = 4b470ed835036a5f2d554e64ae173e7a72b15d6abb9bdc2f2a605d95f677d9740ac193955e0334f6eef13ab1a3254dfaad7712907df9f846e9d75d6fe68d1b75

voms-clients-java.spec

@@ -1,36 +1,26 @@
 Name:		voms-clients-java
-Version:	3.3.7
+Version:	3.3.5
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service Java clients
 
 License:	Apache-2.0
-URL:		https://github.com/italiangrid/voms-clients
+URL:		https://wiki.italiangrid.it/VOMS
-Source0:	%{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildArch:	noarch
 ExclusiveArch:	%{java_arches} noarch
 
-%if %{?fedora}%{!?fedora:0} >= 43
-BuildRequires:	maven-local-openjdk25
-%else
 BuildRequires:	maven-local
-%endif
+BuildRequires:	mvn(org.italiangrid:voms-api-java) >= 3.3.5
-BuildRequires:	mvn(org.italiangrid:voms-api-java) >= 3.3.7
 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.7
+Requires:	mvn(org.italiangrid:voms-api-java) >= 3.3.5
-%if %{?rhel}%{!?rhel:0} == 9
+Requires:	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-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
+Requires(postun):	%{_sbindir}/update-alternatives
 
 # Older versions of voms-clients did not have alternatives
 Conflicts:	voms-clients < 2.0.12
@@ -53,6 +43,7 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info.
 
 # Remove maven-javadoc-plugin configuration
 # We are not building the javadoc for this package
+# And its presence causes the EPEL 8 build to fail
 %pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin
 
 # Do not create source jars
@@ -65,6 +56,12 @@ 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 openjdk 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
 
@@ -79,21 +76,21 @@ mkdir -p %{buildroot}%{_bindir}
 
 cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF
 #!/bin/sh
-VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx32m"}
+VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
 java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInit "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3
 
 cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF
 #!/bin/sh
-VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx32m"}
+VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
 java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyInfo "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3
 
 cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF
 #!/bin/sh
-VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx32m"}
+VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"}
 java \$VOMS_CLIENTS_JAVA_OPTIONS -cp \$(build-classpath voms-clients-java voms-api-java canl-java bcpkix bcutil bcprov commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@"
 EOF
 chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3
@@ -132,7 +129,7 @@ install -p -m 644 man/vomses.5 %{buildroot}%{_mandir}/man5/vomses.5
     --slave %{_mandir}/man1/voms-proxy-destroy.1.gz voms-proxy-destroy-man \
     %{_mandir}/man1/voms-proxy-destroy3.1.gz
 
-%preun
+%postun
 if [ $1 -eq 0 ] ; then
     %{_sbindir}/update-alternatives --remove voms-proxy-init \
     %{_bindir}/voms-proxy-init3
@@ -167,32 +164,7 @@ fi
 %license LICENSE
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.7-3
+* Sat Apr 19 2025 Mattias Ellert  <mattias.ellert@physics.uu.se> - 3.3.5-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Sat Dec 20 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.7-1
-- Update to version 3.3.7
-- Increase default max heap memory (following upstream)
-
-* Wed Aug 06 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.6-1
-- Update to version 3.3.6
-
-* Mon Jul 28 2025 jiri vanek <jvanek@redhat.com> - 3.3.5-5
-- Rebuilt for java-25-openjdk as preffered jdk
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jul 08 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.5-3
-- Allow alternative java versions in EPEL 9
-
-* Tue Apr 22 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.5-2
-- Update URL tag
-
-* Sat Apr 19 2025 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.5-1
 - Update to version 3.3.5
 
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-2