From 81b4e42b3d6e557e589ebafe5e913664801793b1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 4 Aug 2019 06:37:42 +0530 Subject: [PATCH] Revert "define %with_ghc_prof and %with_haddock" didn't really help since koji ignores weak deps This reverts commit 869ad66ecd1209f4cc4ab120dbafb705609988d7. --- ghc-srpm-macros.spec | 7 ++----- macros.ghc-srpm | 6 ------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ghc-srpm-macros.spec b/ghc-srpm-macros.spec index 152813e..461cfe1 100644 --- a/ghc-srpm-macros.spec +++ b/ghc-srpm-macros.spec @@ -4,8 +4,8 @@ %global macros_dir %{_rpmconfigdir}/macros.d Name: ghc-srpm-macros -Version: 1.5 -Release: 1%{?dist} +Version: 1.4.2 +Release: 10%{?dist} Summary: RPM macros for building Haskell source packages License: GPLv2+ @@ -35,9 +35,6 @@ install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc-srpm %changelog -* Sat Aug 3 2019 Jens Petersen - 1.5-1 -- set %%with_ghc_prof and %%with_haddock - * Thu Jul 25 2019 Fedora Release Engineering - 1.4.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/macros.ghc-srpm b/macros.ghc-srpm index 6ac00a2..bd50094 100644 --- a/macros.ghc-srpm +++ b/macros.ghc-srpm @@ -7,9 +7,3 @@ # ghc_arches is not used in current packages but still here for back compat # former archs: alpha ppc sparcv9 armv5tel %ghc_arches %{ix86} x86_64 armv7hl ppc64 ppc64le aarch64 s390 s390x - -# enable profiling libraries in prof subpkgs -%with_ghc_prof 1 - -# enable library documentation in doc subpkgs -%with_haddock 1