From 9c8fe56f65f056c6a210065c27a27f79bf37dcd6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 18 Jan 2018 12:50:08 +0900
Subject: [PATCH] call-stack is now packaged in Fedora

---
 ghc-HUnit.spec | 26 +++++++-------------------
 sources        |  1 -
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec
index 6409904..3da98a1 100644
--- a/ghc-HUnit.spec
+++ b/ghc-HUnit.spec
@@ -4,25 +4,21 @@
 %global pkg_name HUnit
 %global pkgver %{pkg_name}-%{version}
 
-%global callstack call-stack-0.1.0
-%global subpkgs %{callstack}
-
 %bcond_with tests
 
 Name:           ghc-%{pkg_name}
 Version:        1.5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A unit testing framework for Haskell
 
 License:        BSD
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{callstack}/%{callstack}.tar.gz
 
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
-#BuildRequires:  ghc-call-stack-devel
+BuildRequires:  ghc-call-stack-devel
 BuildRequires:  ghc-deepseq-devel
 %if %{with tests}
 BuildRequires:  ghc-filepath-devel
@@ -45,26 +41,15 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package provides the Haskell %{pkg_name} library development files.
 
 
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage %{subpkgs}
-%endif
-
-%global version %{main_version}
-
-
 %prep
-%setup -q -n %{pkgver} -a1
+%setup -q -n %{pkgver}
 
 
 %build
-%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 
 
 %install
-%ghc_libs_install %{subpkgs}
 %ghc_lib_install
 
 
@@ -89,6 +74,9 @@ This package provides the Haskell %{pkg_name} library development files.
 
 
 %changelog
+* Thu Jan 18 2018 Jens Petersen <petersen@redhat.com> - 1.5.0.0-4
+- call-stack is now packaged in Fedora
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 48a9107..548af63 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (call-stack-0.1.0.tar.gz) = 4b8fa206041976948411c7e7babd481b01297c289be72f56dcd56b090bec3b0d3c0a6ef4ce17bb5bd879f08b8059f36ebea664c3c263283457a519e5ce20a0f6
 SHA512 (HUnit-1.5.0.0.tar.gz) = 8be12e82db20ec34069424a47a5fac79d312fe4ad410d0136713431ffed80e020feee78f872b3043ffd41c2033cf643d91a0d8423d186ded152cab51b7888f4e