Skip to content

Commit 99c05b6

Browse files
committed
rpm: fix errors on recent fedora
Fix the following errors when building on fedora 41: > error: line 23: Dependency tokens must begin with alphanumeric, '_' > or '/': BuildRequires: %toolset > error: line 5: %package debuginfo: package grout-debuginfo already > exists Signed-off-by: Robin Jarry <[email protected]>
1 parent b746332 commit 99c05b6

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

rpm/grout.spec

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
%global _lto_cflags %nil
55
%global branch main
66
%global __meson_wrap_mode default
7-
%if "%toolset" != ""
8-
%global __meson /usr/bin/scl run %toolset -- /usr/bin/meson
7+
%if %{defined toolset}
8+
%global __meson /usr/bin/scl run %{toolset} -- /usr/bin/meson
99
%endif
1010

1111
Name: grout
@@ -17,11 +17,11 @@ Version: %{version}
1717
Release: %{release}
1818
Source0: https://github.com/DPDK/grout/archive/%{branch}.tar.gz#/%{name}-%{version}-%{release}.tar.gz
1919

20-
%if "%toolset" == ""
21-
BuildRequires: gcc >= 13
22-
%else
23-
BuildRequires: %toolset
20+
%if %{defined toolset}
21+
BuildRequires: %{toolset}
2422
BuildRequires: scl-utils
23+
%else
24+
BuildRequires: gcc >= 13
2525
%endif
2626
BuildRequires: git
2727
BuildRequires: libarchive-devel
@@ -54,7 +54,9 @@ It comes with a client library to configure it over a standard UNIX socket and
5454
a CLI that uses that library. The CLI can be used as an interactive shell, but
5555
also in scripts one command at a time, or by batches.
5656

57+
%if %{undefined _enable_debug_packages}
5758
%debug_package
59+
%endif
5860

5961
%package devel
6062
Summary: Development headers for building %{name} API clients

0 commit comments

Comments
 (0)