From 68890e8708fa802e49d081f22085b64879b0c9d4 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mar 16 2021 19:36:36 +0000
Subject: dec is now packaged


---

diff --git a/ghc-servant.spec b/ghc-servant.spec
index cd66a30..a37f180 100644
--- a/ghc-servant.spec
+++ b/ghc-servant.spec
@@ -5,15 +5,14 @@
 %global pkgver %{pkg_name}-%{version}
 
 %global singletonbool singleton-bool-0.1.5
-%global dec dec-0.0.3
-%global subpkgs %{dec} %{singletonbool}
+%global subpkgs %{singletonbool}
 
 # testsuite missing deps: quickcheck-instances
 
 Name:           ghc-%{pkg_name}
 Version:        0.16.2
 # can only be reset when all subpkgs bumped
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A family of combinators for defining webservices APIs
 
 License:        BSD
@@ -21,8 +20,7 @@ Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
 Source1:        https://hackage.haskell.org/package/%{singletonbool}/%{singletonbool}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{dec}/%{dec}.tar.gz
-Source3:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
+Source2:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
@@ -51,10 +49,8 @@ BuildRequires:  ghc-text-prof
 BuildRequires:  ghc-transformers-prof
 BuildRequires:  ghc-vault-prof
 # for missing dep 'singleton-bool':
-#BuildRequires:  ghc-dec-prof
+BuildRequires:  ghc-dec-prof
 # End cabal-rpm deps
-# for missing dep 'dec':
-BuildRequires:  ghc-void-prof
 
 %description
 A family of combinators for defining webservices APIs and serving them
@@ -104,7 +100,6 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 %if %{defined ghclibdir}
 %ghc_lib_subpackage %{singletonbool}
-%ghc_lib_subpackage %{dec}
 %endif
 
 %global version %{main_version}
@@ -112,16 +107,11 @@ This package provides the Haskell %{pkg_name} profiling library.
 
 %prep
 # Begin cabal-rpm setup:
-%setup -q -n %{pkgver} -a1 -a2
-cp -bp %{SOURCE3} %{pkg_name}.cabal
-chmod a-x CHANGELOG.md
+%setup -q -n %{pkgver} -a1
+cp -bp %{SOURCE2} %{pkg_name}.cabal
 # End cabal-rpm setup
 
 (
-cd %{dec}
-cabal-tweak-dep-ver base '<4.13' '<4.15'
-)
-(
 cd %{singletonbool}
 cabal-tweak-dep-ver base '<4.13' '<4.15'
 )
@@ -164,6 +154,9 @@ cabal-tweak-dep-ver base '<4.13' '<4.15'
 
 
 %changelog
+* Wed Mar 17 2021 Jens Petersen <petersen@redhat.com> - 0.16.2-6
+- dec is now packaged in Fedora
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 06fb8ce..d76ff73 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 SHA512 (servant-0.16.2.tar.gz) = 81e99308fb5740354f57600e7294f636e6cf988c6dbce6c4e0dd38bd7a2fad1dfe16e718ba74bcd59e8fb8a07c678c5da293a672160a01eee7b646a52c70a1bd
-SHA512 (dec-0.0.3.tar.gz) = 446911a59287b48d8b98acf588671e6ed19fc12ed8adeabdab8f21c1fefb80cac7b59b9fea52a4671b997aa63d2eadda5181490e6901e99e9882de572abdc595
 SHA512 (singleton-bool-0.1.5.tar.gz) = a2b70137f598026d0b330a5ee8265f07056e2073544f62b60cba7fec2345796f5b0d295536a536877bcb01439401047a026d8234531e27431e38701711d5df1a