Compare commits
18 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
69e2875557 | ||
|
|
5d1e672620 | ||
|
|
c8949c5020 | ||
|
|
a045e94786 | ||
|
|
6fc6c00dc4 | ||
|
|
180b90ed23 | ||
|
|
105cedfefe | ||
|
|
56d5d34079 | ||
|
|
eb7cdfd063 | ||
|
|
9fc0db2eb8 | ||
|
|
1ed23e9d78 | ||
|
|
7a8b449212 | ||
|
|
bbfa3a2263 | ||
|
|
2d95f0b2e3 | ||
|
|
73d5cdc8d0 | ||
|
|
5ab7015192 | ||
|
|
de1f386bcc | ||
|
|
c20a30e877 |
2 changed files with 100 additions and 29 deletions
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (voms-clients-java-3.3.2.tar.gz) = 2228e1ee45aac029eaacc8ed859d42ec6668b1d885ab1a7dd2372dfa3fc28814be0edcbea8996f46152fcfed68390dbed8f1526e3d77935de18766748711d4c2
|
SHA512 (voms-clients-java-3.3.7.tar.gz) = 7ed80d50ec844a93fa6f566523fb64dc0b37b7163501bd30029a6ed7bf1d01103fc753daf438405b645c1e8b501846297cc705893fced23e270f31f7b89e7eda
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,36 @@
|
||||||
Name: voms-clients-java
|
Name: voms-clients-java
|
||||||
Version: 3.3.2
|
Version: 3.3.7
|
||||||
Release: 10%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Virtual Organization Membership Service Java clients
|
Summary: Virtual Organization Membership Service Java clients
|
||||||
|
|
||||||
License: ASL 2.0
|
License: Apache-2.0
|
||||||
URL: https://wiki.italiangrid.it/VOMS
|
URL: https://github.com/italiangrid/voms-clients
|
||||||
Source0: https://github.com/italiangrid/voms-clients/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
ExclusiveArch: %{java_arches} noarch
|
ExclusiveArch: %{java_arches} noarch
|
||||||
|
|
||||||
|
%if %{?fedora}%{!?fedora:0} >= 43
|
||||||
|
BuildRequires: maven-local-openjdk25
|
||||||
|
%else
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
|
%endif
|
||||||
|
BuildRequires: mvn(org.italiangrid:voms-api-java) >= 3.3.7
|
||||||
BuildRequires: mvn(commons-cli:commons-cli)
|
BuildRequires: mvn(commons-cli:commons-cli)
|
||||||
BuildRequires: mvn(commons-io:commons-io)
|
BuildRequires: mvn(commons-io:commons-io)
|
||||||
BuildRequires: mvn(junit:junit)
|
BuildRequires: mvn(junit:junit)
|
||||||
BuildRequires: mvn(org.italiangrid:voms-api-java)
|
BuildRequires: asciidoctor
|
||||||
BuildRequires: voms-api-java >= 3.3.2
|
Requires: mvn(org.italiangrid:voms-api-java) >= 3.3.7
|
||||||
Requires: voms-api-java >= 3.3.2
|
%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
|
||||||
|
|
||||||
Requires(post): %{_sbindir}/update-alternatives
|
Requires(post): %{_sbindir}/update-alternatives
|
||||||
Requires(postun): %{_sbindir}/update-alternatives
|
Requires(preun): %{_sbindir}/update-alternatives
|
||||||
|
|
||||||
# Older versions of voms-clients did not have alternatives
|
# Older versions of voms-clients did not have alternatives
|
||||||
Conflicts: voms-clients < 2.0.12
|
Conflicts: voms-clients < 2.0.12
|
||||||
|
|
@ -41,7 +53,6 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info.
|
||||||
|
|
||||||
# Remove maven-javadoc-plugin configuration
|
# Remove maven-javadoc-plugin configuration
|
||||||
# We are not building the javadoc for this package
|
# 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
|
%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin
|
||||||
|
|
||||||
# Do not create source jars
|
# Do not create source jars
|
||||||
|
|
@ -50,12 +61,17 @@ voms-proxy-init, voms-proxy-destroy and voms-proxy-info.
|
||||||
# Don't do assembly
|
# Don't do assembly
|
||||||
%pom_remove_plugin :maven-assembly-plugin
|
%pom_remove_plugin :maven-assembly-plugin
|
||||||
|
|
||||||
# Remove license plugin
|
# The asciidoctor plugin is not available in Fedora
|
||||||
%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin
|
# Run asciidoctor explicitly in the build section instead
|
||||||
|
%pom_remove_plugin org.asciidoctor:asciidoctor-maven-plugin
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build -j
|
%mvn_build -j
|
||||||
|
|
||||||
|
pushd man
|
||||||
|
for x in *.adoc ; do asciidoctor -b manpage $x ; done
|
||||||
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
|
|
@ -63,32 +79,25 @@ mkdir -p %{buildroot}%{_bindir}
|
||||||
|
|
||||||
cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF
|
cat > %{buildroot}%{_bindir}/voms-proxy-init3 << EOF
|
||||||
#!/bin/sh
|
#!/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 "\$@"
|
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
|
EOF
|
||||||
chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3
|
chmod 755 %{buildroot}%{_bindir}/voms-proxy-init3
|
||||||
|
|
||||||
cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF
|
cat > %{buildroot}%{_bindir}/voms-proxy-info3 << EOF
|
||||||
#!/bin/sh
|
#!/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 "\$@"
|
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
|
EOF
|
||||||
chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3
|
chmod 755 %{buildroot}%{_bindir}/voms-proxy-info3
|
||||||
|
|
||||||
cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF
|
cat > %{buildroot}%{_bindir}/voms-proxy-destroy3 << EOF
|
||||||
#!/bin/sh
|
#!/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 "\$@"
|
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
|
EOF
|
||||||
chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3
|
chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy3
|
||||||
|
|
||||||
touch %{buildroot}%{_bindir}/voms-proxy-init
|
|
||||||
chmod 755 %{buildroot}%{_bindir}/voms-proxy-init
|
|
||||||
touch %{buildroot}%{_bindir}/voms-proxy-info
|
|
||||||
chmod 755 %{buildroot}%{_bindir}/voms-proxy-info
|
|
||||||
touch %{buildroot}%{_bindir}/voms-proxy-destroy
|
|
||||||
chmod 755 %{buildroot}%{_bindir}/voms-proxy-destroy
|
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_mandir}/man1
|
mkdir -p %{buildroot}%{_mandir}/man1
|
||||||
install -p -m 644 man/voms-proxy-init.1 \
|
install -p -m 644 man/voms-proxy-init.1 \
|
||||||
%{buildroot}%{_mandir}/man1/voms-proxy-init3.1
|
%{buildroot}%{_mandir}/man1/voms-proxy-init3.1
|
||||||
|
|
@ -97,9 +106,13 @@ install -p -m 644 man/voms-proxy-info.1 \
|
||||||
install -p -m 644 man/voms-proxy-destroy.1 \
|
install -p -m 644 man/voms-proxy-destroy.1 \
|
||||||
%{buildroot}%{_mandir}/man1/voms-proxy-destroy3.1
|
%{buildroot}%{_mandir}/man1/voms-proxy-destroy3.1
|
||||||
|
|
||||||
touch %{buildroot}%{_mandir}/man1/voms-proxy-init.1
|
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||||
touch %{buildroot}%{_mandir}/man1/voms-proxy-info.1
|
for b in voms-proxy-init voms-proxy-info voms-proxy-destroy; do
|
||||||
touch %{buildroot}%{_mandir}/man1/voms-proxy-destroy.1
|
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
|
mkdir -p %{buildroot}%{_mandir}/man5
|
||||||
install -p -m 644 man/vomsdir.5 %{buildroot}%{_mandir}/man5/vomsdir.5
|
install -p -m 644 man/vomsdir.5 %{buildroot}%{_mandir}/man5/vomsdir.5
|
||||||
|
|
@ -119,7 +132,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 \
|
--slave %{_mandir}/man1/voms-proxy-destroy.1.gz voms-proxy-destroy-man \
|
||||||
%{_mandir}/man1/voms-proxy-destroy3.1.gz
|
%{_mandir}/man1/voms-proxy-destroy3.1.gz
|
||||||
|
|
||||||
%postun
|
%preun
|
||||||
if [ $1 -eq 0 ] ; then
|
if [ $1 -eq 0 ] ; then
|
||||||
%{_sbindir}/update-alternatives --remove voms-proxy-init \
|
%{_sbindir}/update-alternatives --remove voms-proxy-init \
|
||||||
%{_bindir}/voms-proxy-init3
|
%{_bindir}/voms-proxy-init3
|
||||||
|
|
@ -130,25 +143,83 @@ if [ $1 -eq 0 ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -f .mfiles
|
||||||
%dir %{_javadir}/%{name}
|
|
||||||
%{_bindir}/voms-proxy-destroy3
|
%{_bindir}/voms-proxy-destroy3
|
||||||
%{_bindir}/voms-proxy-info3
|
%{_bindir}/voms-proxy-info3
|
||||||
%{_bindir}/voms-proxy-init3
|
%{_bindir}/voms-proxy-init3
|
||||||
%ghost %{_bindir}/voms-proxy-destroy
|
%ghost %{_bindir}/voms-proxy-destroy
|
||||||
%ghost %{_bindir}/voms-proxy-info
|
%ghost %{_bindir}/voms-proxy-info
|
||||||
%ghost %{_bindir}/voms-proxy-init
|
%ghost %{_bindir}/voms-proxy-init
|
||||||
|
%ghost %{_sysconfdir}/alternatives/voms-proxy-destroy
|
||||||
|
%ghost %{_sysconfdir}/alternatives/voms-proxy-info
|
||||||
|
%ghost %{_sysconfdir}/alternatives/voms-proxy-init
|
||||||
%{_mandir}/man1/voms-proxy-destroy3.1*
|
%{_mandir}/man1/voms-proxy-destroy3.1*
|
||||||
%{_mandir}/man1/voms-proxy-info3.1*
|
%{_mandir}/man1/voms-proxy-info3.1*
|
||||||
%{_mandir}/man1/voms-proxy-init3.1*
|
%{_mandir}/man1/voms-proxy-init3.1*
|
||||||
%ghost %{_mandir}/man1/voms-proxy-destroy.1*
|
%ghost %{_mandir}/man1/voms-proxy-destroy.1*
|
||||||
%ghost %{_mandir}/man1/voms-proxy-info.1*
|
%ghost %{_mandir}/man1/voms-proxy-info.1*
|
||||||
%ghost %{_mandir}/man1/voms-proxy-init.1*
|
%ghost %{_mandir}/man1/voms-proxy-init.1*
|
||||||
|
%ghost %{_sysconfdir}/alternatives/voms-proxy-destroy.1*
|
||||||
|
%ghost %{_sysconfdir}/alternatives/voms-proxy-info.1*
|
||||||
|
%ghost %{_sysconfdir}/alternatives/voms-proxy-init.1*
|
||||||
%{_mandir}/man5/vomsdir.5*
|
%{_mandir}/man5/vomsdir.5*
|
||||||
%{_mandir}/man5/vomses.5*
|
%{_mandir}/man5/vomses.5*
|
||||||
%doc AUTHORS README.md
|
%doc README.md
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.7-3
|
||||||
|
- 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
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Aug 03 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.3-1
|
||||||
|
- Update to version 3.3.3
|
||||||
|
|
||||||
|
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 24 2024 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.2-15
|
||||||
|
- Update License tags (SPDX)
|
||||||
|
- Add additional ghost files to package (rpmlint)
|
||||||
|
|
||||||
|
* Thu May 23 2024 Marian Koncek <mkoncek@redhat.com> - 3.3.2-14
|
||||||
|
- Add Requires on java-headless
|
||||||
|
|
||||||
|
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 3.3.2-13
|
||||||
|
- Rebuilt for java-21-openjdk as system jdk
|
||||||
|
|
||||||
|
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-10
|
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-10
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue