From 22d34de16e18a692f6672c121dd7b481238ed7fd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 21 Jan 2022 22:10:52 +0800 Subject: [PATCH] disable package notes, which break all Haskell packages (#2043092) occurred during F36 mass rebuild --- ghc-rpm-macros.spec | 7 +++++-- macros.ghc | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 4802b92..1db2df6 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,8 +7,8 @@ %endif Name: ghc-rpm-macros -Version: 2.3.11 -Release: 2%{?dist} +Version: 2.3.12 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -184,6 +184,9 @@ EOF %changelog +* Fri Jan 21 2022 Jens Petersen - 2.3.12-1 +- disable package notes since breaks all Haskell packages (#2043092) + * Thu Jan 20 2022 Fedora Release Engineering - 2.3.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/macros.ghc b/macros.ghc index ccc4b1a..a6c20e5 100644 --- a/macros.ghc +++ b/macros.ghc @@ -19,6 +19,7 @@ CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //' -e 's/-Werror=format-se CFLAGS="${CFLAGS:-%optflags}"\ %endif\ export CFLAGS\ +%undefine _package_note_flags\ %global _hardened_ldflags %{nil}\ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ %{nil}