From 509ff09e05a6f830dd8ef4b85422b1f45cac3453 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 15 Jun 2024 01:05:36 +0800 Subject: [PATCH] undefine %debug_package rather than %_enable_debug_packages avoids "Empty %files file debugsourcefiles.list" error See https://bugzilla.redhat.com/show_bug.cgi?id=2292419 --- ghc-rpm-macros.spec | 5 ++++- macros.ghc | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 4149159..53d1efe 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -205,6 +205,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries %changelog +* Sat Jun 15 2024 Jens Petersen - 2.7.1-1 +- build macros now undefine debug_package rather than _enable_debug_packages + * Mon Mar 18 2024 Jens Petersen - 2.7.0-1 - rename no-prof subpackage to quick - quick: add ghc_haddocks override diff --git a/macros.ghc b/macros.ghc index 7855fc1..5cb471b 100644 --- a/macros.ghc +++ b/macros.ghc @@ -14,14 +14,14 @@ LANG=C.utf8\ # ghc_bin_build: -W: use default ghc (ie ignore ghc_name) %ghc_bin_build(W)\ %ghc_fix_doc_perms\ -%{?!ghc_debuginfo:%undefine _enable_debug_packages}\ +%{?!ghc_debuginfo:%global debug_package %{nil}}\ %cabal_configure\ %cabal build %{?ghc_smp_mflags} %{?cabal_build_options} # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ %ghc_fix_doc_perms\ -%{?!ghc_debuginfo:%undefine _enable_debug_packages}\ +%{?!ghc_debuginfo:%global debug_package %{nil}}\ %if 0%{?rhel} && 0%{?rhel} < 8\ licensedirversion=%{?2:-%2}\ %endif\