Skip to content

Commit 61e1724

Browse files
author
Luca Bassi
committed
Build RPM for AlmaLinux 10
1 parent 38a30cf commit 61e1724

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/build-rpm.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [almalinux]
15-
version: [8, 9]
15+
version: [8, 9, 10]
1616
outputs:
1717
repo: ${{ steps.info.outputs.repo }}
1818
version_pom: ${{ steps.info.outputs.version_pom }}
@@ -22,8 +22,9 @@ jobs:
2222
- name: Install dependencies
2323
run: |
2424
dnf upgrade -y
25-
dnf module enable -y maven:3.8
26-
dnf install -y git rpmdevtools rpmlint maven-openjdk17
25+
[[ "${{ matrix.version }}" -lt 10 ]] && dnf module enable -y maven:3.8
26+
[[ "${{ matrix.version }}" = 10 ]] && dnf install -y almalinux-release-devel
27+
dnf install -y git maven-openjdk21 rpmdevtools rpmlint
2728
- name: Setup build tree
2829
run: |
2930
echo "%_topdir $(pwd)/rpmbuild" >> ~/.rpmmacros

voms-api-java.spec

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ URL: https://github.com/italiangrid/voms-api-java
1616

1717
BuildArch: noarch
1818

19-
BuildRequires: maven-openjdk17
19+
BuildRequires: maven-openjdk21
2020

2121
Provides: voms-api-java3 = %{version}
2222
Requires: canl-java >= 2.7
23-
Requires: java-headless >= 1.8
23+
Requires: java-headless >= 1:1.8.0
2424

2525
%description
2626
The Virtual Organization Membership Service (VOMS) is an attribute authority
@@ -56,9 +56,6 @@ ln -s %{name}-%{version_pom}.jar %{buildroot}%{_javadir}/%{name}.jar
5656
cp -r target/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version_pom}
5757
ln -s %{name}-%{version_pom} %{buildroot}%{_javadocdir}/%{name}
5858

59-
%clean
60-
rm -rf %{buildroot}
61-
6259
%files
6360
%defattr(-,root,root,-)
6461

0 commit comments

Comments
 (0)