Skip to content

Commit e8ce119

Browse files
authored
Merge pull request #289 from CESNET/epel-10-update
spec: add support for building on EPEL 10
2 parents ef9e042 + d129383 commit e8ce119

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

pkg/rpm/ipfixprobe-msec.spec.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,17 @@ BuildRequires: gcc-toolset-14-gcc
2222
BuildRequires: gcc-toolset-14-gcc-c++
2323
%endif
2424

25-
%if 0%{?rhel} == 9
25+
%if 0%{?rhel} >= 9
2626
BuildRequires: gcc >= 10
2727
BuildRequires: gcc-c++ >= 10
2828
%endif
29+
2930
BuildRequires: make
3031
BuildRequires: cmake >= 3.12
3132
BuildRequires: libunwind-devel
33+
%if 0%{?rhel} <= 9
3234
BuildRequires: gcc-toolset-14-libatomic-devel
35+
%endif
3336
BuildRequires: pkgconfig
3437
BuildRequires: lz4-devel
3538
BuildRequires: openssl-devel

pkg/rpm/ipfixprobe-nemea.spec.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ BuildRequires: gcc-toolset-14-gcc
2525
BuildRequires: gcc-toolset-14-gcc-c++
2626
%endif
2727

28-
%if 0%{?rhel} == 9
28+
%if 0%{?rhel} >= 9
2929
BuildRequires: gcc >= 10
3030
BuildRequires: gcc-c++ >= 10
3131
%endif
3232

3333
BuildRequires: make
3434
BuildRequires: cmake >= 3.12
3535
BuildRequires: libunwind-devel
36+
%if 0%{?rhel} <= 9
3637
BuildRequires: gcc-toolset-14-libatomic-devel
38+
%endif
3739
BuildRequires: pkgconfig
3840
BuildRequires: lz4-devel
3941
BuildRequires: openssl-devel

pkg/rpm/ipfixprobe.spec.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,17 @@ BuildRequires: gcc-toolset-14-gcc
2727
BuildRequires: gcc-toolset-14-gcc-c++
2828
%endif
2929

30-
%if 0%{?rhel} == 9
30+
%if 0%{?rhel} >= 9
3131
BuildRequires: gcc >= 10
3232
BuildRequires: gcc-c++ >= 10
3333
%endif
3434

3535
BuildRequires: make
3636
BuildRequires: cmake >= 3.12
3737
BuildRequires: libunwind-devel
38+
%if 0%{?rhel} <= 9
3839
BuildRequires: gcc-toolset-14-libatomic-devel
40+
%endif
3941
BuildRequires: pkgconfig
4042
BuildRequires: lz4-devel
4143
BuildRequires: openssl-devel

0 commit comments

Comments
 (0)