From aabec522b9ebac47201a2d6e6dc4f6b6e123b274 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 3 Sep 2020 15:49:14 +0800
Subject: [PATCH] ghc-lib-parser was packaged

---
 hlint.spec | 26 ++++++++------------------
 sources    |  1 -
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/hlint.spec b/hlint.spec
index 4a17435..51948af 100644
--- a/hlint.spec
+++ b/hlint.spec
@@ -4,9 +4,8 @@
 %global pkg_name hlint
 %global pkgver %{pkg_name}-%{version}
 
-%global ghclibparser ghc-lib-parser-8.10.1.20200523
 %global ghclibparserex ghc-lib-parser-ex-8.10.0.15
-%global subpkgs %{ghclibparser} %{ghclibparserex}
+%global subpkgs %{ghclibparserex}
 
 Name:           %{pkg_name}
 Version:        3.1.6
@@ -18,8 +17,7 @@ License:        BSD
 Url:            https://hackage.haskell.org/package/%{name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{ghclibparser}/%{ghclibparser}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{ghclibparserex}/%{ghclibparserex}.tar.gz
+Source1:        https://hackage.haskell.org/package/%{ghclibparserex}/%{ghclibparserex}.tar.gz
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
@@ -38,7 +36,7 @@ BuildRequires:  ghc-extra-prof
 BuildRequires:  ghc-file-embed-prof
 BuildRequires:  ghc-filepath-prof
 BuildRequires:  ghc-filepattern-prof
-#BuildRequires:  ghc-ghc-lib-parser-prof
+BuildRequires:  ghc-ghc-lib-parser-prof
 #BuildRequires:  ghc-ghc-lib-parser-ex-prof
 BuildRequires:  ghc-hscolour-prof
 BuildRequires:  ghc-process-prof
@@ -51,20 +49,12 @@ BuildRequires:  ghc-utf8-string-prof
 BuildRequires:  ghc-vector-prof
 BuildRequires:  ghc-yaml-prof
 Requires:       %{name}-common = %{version}-%{release}
-# for missing dep 'ghc-lib-parser':
-BuildRequires:  ghc-array-prof
-BuildRequires:  ghc-binary-prof
-BuildRequires:  ghc-deepseq-prof
-BuildRequires:  ghc-hpc-prof
-BuildRequires:  ghc-pretty-prof
-BuildRequires:  ghc-time-prof
-BuildRequires:  ghc-unix-prof
 # End cabal-rpm deps
 
 # for ghc-lib-parser
 BuildRequires:  alex
 BuildRequires:  happy
-# may require ghc-8.10 to build
+# ghc-lib-parser build fails on s390x
 # https://github.com/digital-asset/ghc-lib/issues/184 (s390x)
 # https://bugzilla.redhat.com/show_bug.cgi?id=1806109
 ExcludeArch:    s390x
@@ -126,7 +116,6 @@ This package provides the Haskell %{name} profiling library.
 %global main_version %{version}
 
 %if %{defined ghclibdir}
-%ghc_lib_subpackage %{ghclibparser}
 %ghc_lib_subpackage %{ghclibparserex}
 %endif
 
@@ -135,7 +124,7 @@ This package provides the Haskell %{name} profiling library.
 
 %prep
 # Begin cabal-rpm setup:
-%setup -q -a1 -a2
+%setup -q -a1
 # End cabal-rpm setup
 
 
@@ -161,8 +150,6 @@ mv %{buildroot}%{_ghcdocdir}{,-common}
 mkdir -p %{buildroot}%{_mandir}/man1
 mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man1
 
-echo "%{_datadir}/%{ghclibparser}/" >> %{ghclibparser}/ghc-ghc-lib-parser.files
-
 
 %files
 # Begin cabal-rpm files:
@@ -197,6 +184,9 @@ echo "%{_datadir}/%{ghclibparser}/" >> %{ghclibparser}/ghc-ghc-lib-parser.files
 
 
 %changelog
+* Thu Sep  3 2020 Jens Petersen <petersen@redhat.com>
+- ghc-lib-parser was packaged
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 636e083..90c3867 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (ghc-lib-parser-8.10.1.20200523.tar.gz) = 5f018191d9b7938c8697396608c9ab2f79563ce3e788878854e9bb4081105f6d9a5fa6b5d3561248c5a6c38fc6665322e12e9e9dedf491c0f535b93c208c2fde
 SHA512 (ghc-lib-parser-ex-8.10.0.15.tar.gz) = 701ea577355a71743c2e69c87403314b1b81ba8d8242bf57f6bae896414efb13b78d60ff2403bfc85efb88752d6bf84d6d3f9d680fde956306d65bc60b74e2e7
 SHA512 (hlint-3.1.6.tar.gz) = c9052968a641178dcecf5c41911f8453b120700b2c7eed9a9550c3f36db6938f232e7236813cbde9638814a874b938755eaf51469f347039ddb499351644d01f