unsubpackage cabal-doctest

ghc-distributive.spec

@@ -4,30 +4,25 @@
 %global pkg_name distributive
 %global pkgver %{pkg_name}-%{version}
 
-%global cabaldoctest cabal-doctest-1.0.6
-%global subpkgs %{cabaldoctest}
-
 %bcond_with tests
 
 Name:           ghc-%{pkg_name}
 Version:        0.5.3
-# can only be reset when all subpkgs bumped
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Distributive functors -- Dual to Traversable
 
 License:        BSD
 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/%{cabaldoctest}/%{cabaldoctest}.tar.gz
-Source2:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
+Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-base-orphans-devel
-#BuildRequires:  ghc-cabal-doctest-devel
+BuildRequires:  ghc-cabal-doctest-devel
 BuildRequires:  ghc-tagged-devel
 BuildRequires:  ghc-transformers-compat-devel
 BuildRequires:  ghc-transformers-devel
@@ -57,38 +52,21 @@ 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 %{cabaldoctest}
-%endif
-
-%global version %{main_version}
-
-
 %prep
 # Begin cabal-rpm setup:
-%setup -q -n %{pkgver} -a1
-cp -bp %{SOURCE2} %{pkg_name}.cabal
+%setup -q -n %{pkgver}
+cp -bp %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm setup
 
-(
-cd %{cabaldoctest}
-cabal-tweak-dep-ver Cabal '<2.1' '<2.5'
-cabal-tweak-dep-ver base '<4.11' '<4.12'
-)
-
 
 %build
 # Begin cabal-rpm build:
-%ghc_libs_build %{subpkgs}
 %ghc_lib_build
 # End cabal-rpm build
 
 
 %install
 # Begin cabal-rpm install
-%ghc_libs_install %{subpkgs}
 %ghc_lib_install
 # End cabal-rpm install
 
@@ -116,6 +94,9 @@ cabal-tweak-dep-ver base '<4.11' '<4.12'
 
 
 %changelog
+* Sun Mar 10 2019 Jens Petersen <petersen@redhat.com> - 0.5.3-12
+- unsubpackage cabal-doctest
+
 * Sat Feb 23 2019 Jens Petersen <petersen@redhat.com> - 0.5.3-11
 - update cabal-doctest to 1.0.6
 

sources

@@ -1,2 +1 @@
 SHA512 (distributive-0.5.3.tar.gz) = 34d6019dc4588d1a10a40daa09822b01660da9c485d06a28722727ca1d7850eeda676da255792335e38be509a2539c02e11a404d9c45618ae064d90718cad280
-SHA512 (cabal-doctest-1.0.6.tar.gz) = f009c91f9e9d2406a2ccb7049d554291527dcb3846fd63828147e03fc4c893223929261745ab5a8fb036bcf16b3c286587d3de8daa0fff330fb3c2d6b25fa399