From 000d471347b3961c545ac427b682526823755a5f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 19 Feb 2024 01:57:48 +0800 Subject: [PATCH] %cabal_test: conditional is in cabal-rpm --- ghc-rpm-macros.spec | 7 +++++-- macros.ghc | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 49cdafd..18db9e4 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,8 +7,8 @@ %endif Name: ghc-rpm-macros -Version: 2.6.5 -Release: 3%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPL-3.0-or-later @@ -185,6 +185,9 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries %changelog +* Mon Feb 19 2024 Jens Petersen - 2.6.6-1 +- cabal_test: drop conditional since it is in cabal-rpm + * Wed Jan 24 2024 Fedora Release Engineering - 2.6.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/macros.ghc b/macros.ghc index 71e2434..4608685 100644 --- a/macros.ghc +++ b/macros.ghc @@ -109,10 +109,7 @@ fi\ %cabal_install %cabal copy --destdir=%{buildroot} %{?cabal_install_options} # tests -%cabal_test\ -%if %{with tests}\ -%cabal test %{?cabal_test_options}\ -%endif +%cabal_test %cabal test %{?cabal_test_options} # no _pkgdocdir in EPEL <= 7 %ghc_pkgdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}