diff --git a/sources b/sources index 3bbcccc..76118e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.7.tar.gz) = 7ed80d50ec844a93fa6f566523fb64dc0b37b7163501bd30029a6ed7bf1d01103fc753daf438405b645c1e8b501846297cc705893fced23e270f31f7b89e7eda +SHA512 (voms-clients-java-3.3.3.tar.gz) = cb53d1dbdd53447af006a5cce9167407c16f7eca055f3f658d3c795a74d0b4f3ec7de240999b98097d26b52c90e7ede771cedb6383feafce23029fed7b0de8ff diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 144f451..904c8ac 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,36 +1,25 @@ Name: voms-clients-java -Version: 3.3.7 -Release: 3%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 -URL: https://github.com/italiangrid/voms-clients -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz - +URL: https://wiki.italiangrid.it/VOMS +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.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 -%if %{?rhel}%{!?rhel:0} == 9 -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 +BuildRequires: mvn(org.italiangrid:voms-api-java) +BuildRequires: voms-api-java >= 3.3.3 +Requires: voms-api-java >= 3.3.3 +Requires: java-headless 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 +42,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 @@ -61,40 +51,43 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. # Don't do assembly %pom_remove_plugin :maven-assembly-plugin -# The asciidoctor plugin is not available in Fedora -# Run asciidoctor explicitly in the build section instead -%pom_remove_plugin org.asciidoctor:asciidoctor-maven-plugin +# Remove license plugin +%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin %build %mvn_build -j -pushd man -for x in *.adoc ; do asciidoctor -b manpage $x ; done -popd - %install %mvn_install mkdir -p %{buildroot}%{_bindir} +%if %{?rhel}%{!?rhel:0} == 8 +guava_cp="guava20" +bc_cp="bcpkix bcprov" +%else +guava_cp="guava/guava" +bc_cp="bcpkix bcutil bcprov" +%endif + cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF #!/bin/sh -VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx32m"} -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 "\$@" +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 ${guava_cp} ${bc_cp} 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"} -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 "\$@" +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 ${guava_cp} ${bc_cp} 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"} -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 "\$@" +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 ${guava_cp} ${bc_cp} commons-cli commons-io) org.italiangrid.voms.clients.VomsProxyDestroy "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3 @@ -132,7 +125,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 @@ -163,41 +156,10 @@ fi %ghost %{_sysconfdir}/alternatives/voms-proxy-init.1* %{_mandir}/man5/vomsdir.5* %{_mandir}/man5/vomses.5* -%doc README.md +%doc AUTHORS README.md %license LICENSE %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 3.3.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 3.3.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Sat Dec 20 2025 Mattias Ellert - 3.3.7-1 -- Update to version 3.3.7 -- Increase default max heap memory (following upstream) - -* 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 - -* Fri Jul 25 2025 Fedora Release Engineering - 3.3.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jul 08 2025 Mattias Ellert - 3.3.5-3 -- Allow alternative java versions in EPEL 9 - -* Tue Apr 22 2025 Mattias Ellert - 3.3.5-2 -- Update URL tag - -* Sat Apr 19 2025 Mattias Ellert - 3.3.5-1 -- Update to version 3.3.5 - -* Sun Jan 19 2025 Fedora Release Engineering - 3.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Sat Aug 03 2024 Mattias Ellert - 3.3.3-1 - Update to version 3.3.3