From 14ae992fbfd391baa75fde6809efc1c5bffcc405 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 5 May 2021 13:30:43 +0200 Subject: [PATCH] Fix FTBFS due to an incompatible load. The FTBFS has started to happen with rpm-4.16.90-0.git15395.2.fc35. root.log ``` DEBUG util.py:444: error: line 116: Unknown tag: /chroot_tmpdir/srpm_unpacked/SOURCES/macros.ruby ``` As the `%{?load:...}` is undocumented, it is gone. https://github.com/rpm-software-management/rpm/issues/1669 --- ruby.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ruby.spec b/ruby.spec index 9f90c59..a9d9dc6 100644 --- a/ruby.spec +++ b/ruby.spec @@ -114,8 +114,8 @@ Source14: test_systemtap.rb # The load directive is supported since RPM 4.12, i.e. F21+. The build process # fails on older Fedoras. -%{?load:%{SOURCE4}} -%{?load:%{SOURCE5}} +%{load:%{SOURCE4}} +%{load:%{SOURCE5}} # Fix ruby_version abuse. # https://bugs.ruby-lang.org/issues/11002 @@ -1280,6 +1280,7 @@ MSPECOPTS="$MSPECOPTS -P 'File.lchmod changes the file mode of the link and not * Tue Jun 15 2021 Jarek Prokop - 2.7.3-138 - Properly support DWARF5 debug information. Resolves: rhbz#1920533 +- Fix FTBFS due to incompatible load directive. * Wed Apr 07 2021 Pavel Valena - 2.7.3-138 - Upgrade to Ruby 2.7.3.