From c20a30e877bba9a86c5588d86096c9e76f25d61b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:51:20 +0000 Subject: [PATCH 01/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index a12f6a2..fb24c06 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.3.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.3.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From de1f386bccdead89fada427822281051d0fd7b7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:11:19 +0000 Subject: [PATCH 02/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index fb24c06..409ee20 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.3.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5ab7015192252a224d549cab6b365dfaa474249d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:28:31 +0100 Subject: [PATCH 03/17] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 409ee20..64fbb9c 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Tue Feb 27 2024 Jiri Vanek - 3.3.2-13 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 73d5cdc8d0c218a61e7af844d8d30c34528992e1 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 21:40:02 +0100 Subject: [PATCH 04/17] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 409ee20..345f5e6 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -149,6 +149,9 @@ fi %license LICENSE %changelog +* Sat Mar 02 2024 Jiri Vanek - 3.3.2-13 +- Rebuilt for java-21-openjdk as system jdk + * Sat Jan 27 2024 Fedora Release Engineering - 3.3.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2d95f0b2e3ed3ff6ea5a39c5a824468da7fa7c3e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 23 May 2024 10:14:18 +0200 Subject: [PATCH 05/17] Add Requires on java-headless --- voms-clients-java.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 64fbb9c..cdd4409 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Virtual Organization Membership Service Java clients License: ASL 2.0 @@ -16,6 +16,7 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.italiangrid:voms-api-java) BuildRequires: voms-api-java >= 3.3.2 Requires: voms-api-java >= 3.3.2 +Requires: java-headless Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -149,6 +150,9 @@ fi %license LICENSE %changelog +* Thu May 23 2024 Marian Koncek - 3.3.2-14 +- Add Requires on java-headless + * Tue Feb 27 2024 Jiri Vanek - 3.3.2-13 - Rebuilt for java-21-openjdk as system jdk From 7a8b449212c0be32d3dfd242927edfb4acba0fce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:59:59 +0000 Subject: [PATCH 06/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 0428e8d..ef7e2ad 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -174,6 +174,9 @@ fi %license LICENSE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.3.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri May 24 2024 Mattias Ellert - 3.3.2-15 - Update License tags (SPDX) - Add additional ghost files to package (rpmlint) From 1ed23e9d78e298e4e8212661577b1d86c369092e Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 3 Aug 2024 23:55:51 +0200 Subject: [PATCH 07/17] Update to version 3.3.3 --- sources | 2 +- voms-clients-java.spec | 61 +++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/sources b/sources index 7629928..76118e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.2.tar.gz) = 2228e1ee45aac029eaacc8ed859d42ec6668b1d885ab1a7dd2372dfa3fc28814be0edcbea8996f46152fcfed68390dbed8f1526e3d77935de18766748711d4c2 +SHA512 (voms-clients-java-3.3.3.tar.gz) = cb53d1dbdd53447af006a5cce9167407c16f7eca055f3f658d3c795a74d0b4f3ec7de240999b98097d26b52c90e7ede771cedb6383feafce23029fed7b0de8ff diff --git a/voms-clients-java.spec b/voms-clients-java.spec index ef7e2ad..904c8ac 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java -Version: 3.3.2 -Release: 16%{?dist} +Version: 3.3.3 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -14,8 +14,8 @@ BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.italiangrid:voms-api-java) -BuildRequires: voms-api-java >= 3.3.2 -Requires: voms-api-java >= 3.3.2 +BuildRequires: voms-api-java >= 3.3.3 +Requires: voms-api-java >= 3.3.3 Requires: java-headless Requires(post): %{_sbindir}/update-alternatives @@ -62,43 +62,35 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. 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 -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 "\$@" +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 -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 "\$@" +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 -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 "\$@" +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 -ln -s %{_sysconfdir}/alternatives/voms-proxy-init \ - %{buildroot}%{_bindir}/voms-proxy-init -ln -s %{_sysconfdir}/alternatives/voms-proxy-info \ - %{buildroot}%{_bindir}/voms-proxy-info -ln -s %{_sysconfdir}/alternatives/voms-proxy-destroy \ - %{buildroot}%{_bindir}/voms-proxy-destroy - -mkdir -p %{buildroot}%{_sysconfdir}/alternatives - -ln -s %{_bindir}/voms-proxy-init3 \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-init -ln -s %{_bindir}/voms-proxy-info3 \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-info -ln -s %{_bindir}/voms-proxy-destroy3 \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-destroy - mkdir -p %{buildroot}%{_mandir}/man1 install -p -m 644 man/voms-proxy-init.1 \ %{buildroot}%{_mandir}/man1/voms-proxy-init3.1 @@ -107,19 +99,13 @@ install -p -m 644 man/voms-proxy-info.1 \ install -p -m 644 man/voms-proxy-destroy.1 \ %{buildroot}%{_mandir}/man1/voms-proxy-destroy3.1 -ln -s %{_sysconfdir}/alternatives/voms-proxy-init.1.gz \ - %{buildroot}%{_mandir}/man1/voms-proxy-init.1.gz -ln -s %{_sysconfdir}/alternatives/voms-proxy-info.1.gz \ - %{buildroot}%{_mandir}/man1/voms-proxy-info.1.gz -ln -s %{_sysconfdir}/alternatives/voms-proxy-destroy.1.gz \ - %{buildroot}%{_mandir}/man1/voms-proxy-destroy.1.gz - -ln -s %{_mandir}/man1/voms-proxy-init3.1.gz \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-init.1.gz -ln -s %{_mandir}/man1/voms-proxy-info3.1.gz \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-info.1.gz -ln -s %{_mandir}/man1/voms-proxy-destroy3.1.gz \ - %{buildroot}%{_sysconfdir}/alternatives/voms-proxy-destroy.1.gz +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +for b in voms-proxy-init voms-proxy-info voms-proxy-destroy; do + ln -s %{_bindir}/${b}3 %{buildroot}%{_sysconfdir}/alternatives/${b} + ln -s %{_sysconfdir}/alternatives/${b} %{buildroot}%{_bindir}/${b} + ln -s %{_mandir}/man1/${b}3.1.gz %{buildroot}%{_sysconfdir}/alternatives/${b}.1.gz + ln -s %{_sysconfdir}/alternatives/${b}.1.gz %{buildroot}%{_mandir}/man1/${b}.1.gz +done mkdir -p %{buildroot}%{_mandir}/man5 install -p -m 644 man/vomsdir.5 %{buildroot}%{_mandir}/man5/vomsdir.5 @@ -174,6 +160,9 @@ fi %license LICENSE %changelog +* Sat Aug 03 2024 Mattias Ellert - 3.3.3-1 +- Update to version 3.3.3 + * Sat Jul 20 2024 Fedora Release Engineering - 3.3.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9fc0db2eb82e77f4b0722be2c7ad00b9e4e13d0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:36:15 +0000 Subject: [PATCH 08/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 904c8ac..7d1854e 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -160,6 +160,9 @@ fi %license LICENSE %changelog +* 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 From eb7cdfd063c342f63ac30b8fd9adbf1b8dbae651 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 19 Apr 2025 15:30:52 +0200 Subject: [PATCH 09/17] Update to version 3.3.5 --- sources | 2 +- voms-clients-java.spec | 45 ++++++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/sources b/sources index 76118e6..b4e4f9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.3.tar.gz) = cb53d1dbdd53447af006a5cce9167407c16f7eca055f3f658d3c795a74d0b4f3ec7de240999b98097d26b52c90e7ede771cedb6383feafce23029fed7b0de8ff +SHA512 (voms-clients-java-3.3.5.tar.gz) = 4b470ed835036a5f2d554e64ae173e7a72b15d6abb9bdc2f2a605d95f677d9740ac193955e0334f6eef13ab1a3254dfaad7712907df9f846e9d75d6fe68d1b75 diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 7d1854e..eefcbef 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,21 +1,22 @@ Name: voms-clients-java -Version: 3.3.3 -Release: 2%{?dist} +Version: 3.3.5 +Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 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 BuildRequires: maven-local +BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.italiangrid:voms-api-java) -BuildRequires: voms-api-java >= 3.3.3 -Requires: voms-api-java >= 3.3.3 +BuildRequires: asciidoctor +Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 Requires: java-headless Requires(post): %{_sbindir}/update-alternatives @@ -51,43 +52,46 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. # Don't do assembly %pom_remove_plugin :maven-assembly-plugin -# Remove license plugin -%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-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 + +%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 +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 -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 "\$@" +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 -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 "\$@" +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 -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 "\$@" +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 @@ -156,10 +160,13 @@ fi %ghost %{_sysconfdir}/alternatives/voms-proxy-init.1* %{_mandir}/man5/vomsdir.5* %{_mandir}/man5/vomses.5* -%doc AUTHORS README.md +%doc README.md %license LICENSE %changelog +* 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 From 56d5d340798930d4febbc1d83a6d273b6cbc6589 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 22 Apr 2025 22:43:40 +0200 Subject: [PATCH 10/17] Update URL tag --- voms-clients-java.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index eefcbef..ecb0d4c 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,11 +1,11 @@ Name: voms-clients-java Version: 3.3.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 -URL: https://wiki.italiangrid.it/VOMS -Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/italiangrid/voms-clients +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -43,7 +43,6 @@ 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 @@ -164,6 +163,9 @@ fi %license LICENSE %changelog +* 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 From 105cedfefe2638bac310cf553e1254e1e1ae2b9a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 8 Jul 2025 22:09:20 +0200 Subject: [PATCH 11/17] Allow alternative java versions in EPEL 9 --- voms-clients-java.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index ecb0d4c..d33f76e 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -17,10 +17,15 @@ BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: asciidoctor Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 +%if %{?rhel}%{!?rhel:0} == 9 +Requires: (java-headless or java-11-headless or java-17-headless or java-21-headless) +Suggests: java-headless +%else Requires: java-headless +%endif Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives +Requires(preun): %{_sbindir}/update-alternatives # Older versions of voms-clients did not have alternatives Conflicts: voms-clients < 2.0.12 @@ -56,7 +61,7 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info. %pom_remove_plugin org.asciidoctor:asciidoctor-maven-plugin %if %{?rhel}%{!?rhel:0} == 9 -# Default openjdk in RHEL 9 is 11 +# 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 @@ -128,7 +133,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 -%postun +%preun if [ $1 -eq 0 ] ; then %{_sbindir}/update-alternatives --remove voms-proxy-init \ %{_bindir}/voms-proxy-init3 @@ -163,10 +168,13 @@ fi %license LICENSE %changelog +* 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 +* 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 From 180b90ed236f2f8a176bbfefe5fa0500fbfce52c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:13:10 +0000 Subject: [PATCH 12/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index d33f76e..1088631 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -168,6 +168,9 @@ fi %license LICENSE %changelog +* 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 From 6fc6c00dc42183907ace7f49b1df9a9ce25c92c5 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:26:36 +0200 Subject: [PATCH 13/17] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- voms-clients-java.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 1088631..fd9b0da 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -10,7 +10,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 BuildRequires: mvn(commons-cli:commons-cli) BuildRequires: mvn(commons-io:commons-io) @@ -21,7 +21,7 @@ Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.5 Requires: (java-headless or java-11-headless or java-17-headless or java-21-headless) Suggests: java-headless %else -Requires: java-headless +Requires: java-25-headless %endif Requires(post): %{_sbindir}/update-alternatives @@ -168,6 +168,9 @@ fi %license LICENSE %changelog +* 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 From a045e9478632cf5ebbb756e61acc2b4c4264e22a Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 6 Aug 2025 10:32:44 +0200 Subject: [PATCH 14/17] 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 From c8949c50200d5177ac0dba4e01fcdc6e03585bd4 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 21 Dec 2025 05:52:31 +0100 Subject: [PATCH 15/17] Update to version 3.3.7 Increase default max heap memory (following upstream) --- sources | 2 +- voms-clients-java.spec | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sources b/sources index 6fa7c95..3bbcccc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (voms-clients-java-3.3.6.tar.gz) = b0ee2a09e7e4001e23f5afd48e07c410a75d08eea3fe62377afce489e1e8058e90ff46e7869ba1afff636969b498b1f1002d14ea6a077cfe24f98a979842542d +SHA512 (voms-clients-java-3.3.7.tar.gz) = 7ed80d50ec844a93fa6f566523fb64dc0b37b7163501bd30029a6ed7bf1d01103fc753daf438405b645c1e8b501846297cc705893fced23e270f31f7b89e7eda diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 7340759..eab22ce 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,5 +1,5 @@ Name: voms-clients-java -Version: 3.3.6 +Version: 3.3.7 Release: 1%{?dist} Summary: Virtual Organization Membership Service Java clients @@ -15,12 +15,12 @@ BuildRequires: maven-local-openjdk25 %else BuildRequires: maven-local %endif -BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.6 +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.6 +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 @@ -79,21 +79,21 @@ mkdir -p %{buildroot}%{_bindir} cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF #!/bin/sh -VOMS_CLIENTS_JAVA_OPTIONS=\${VOMS_CLIENTS_JAVA_OPTIONS:-"-XX:+UseSerialGC -Xmx16m"} +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 "\$@" 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 -Xmx16m"} +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 "\$@" 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 -Xmx16m"} +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 "\$@" EOF chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3 @@ -167,7 +167,11 @@ fi %license LICENSE %changelog -* Wed Aug 06 2025 Mattias Ellert - 3.3.6-1 +* 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 From 5d1e672620e39f489c846891830319e0c10211cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:02:57 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index eab22ce..85a58db 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -167,6 +167,9 @@ fi %license LICENSE %changelog +* 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) From 69e28755573088742f5e895dcdf5e0635a99c664 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:37:04 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- voms-clients-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/voms-clients-java.spec b/voms-clients-java.spec index 85a58db..144f451 100644 --- a/voms-clients-java.spec +++ b/voms-clients-java.spec @@ -1,6 +1,6 @@ Name: voms-clients-java Version: 3.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Organization Membership Service Java clients License: Apache-2.0 @@ -167,6 +167,9 @@ fi %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