unbundle singleton-bool

ghc-servant.spec

@@ -1,32 +1,27 @@
-# generated by cabal-rpm-2.0.6 --subpackage
+# generated by cabal-rpm-2.0.7 --subpackage
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name servant
 %global pkgver %{pkg_name}-%{version}
 
-%global singletonbool singleton-bool-0.1.5
-%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:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A family of combinators for defining webservices APIs
 
 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/%{singletonbool}/%{singletonbool}.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-cabal-doctest-devel
-BuildRequires:  ghc-rpm-macros-extra
+BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-QuickCheck-prof
 BuildRequires:  ghc-aeson-prof
 BuildRequires:  ghc-attoparsec-prof
@@ -42,14 +37,12 @@ BuildRequires:  ghc-http-types-prof
 BuildRequires:  ghc-mmorph-prof
 BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-network-uri-prof
-#BuildRequires:  ghc-singleton-bool-prof
+BuildRequires:  ghc-singleton-bool-prof
 BuildRequires:  ghc-string-conversions-prof
 BuildRequires:  ghc-tagged-prof
 BuildRequires:  ghc-text-prof
 BuildRequires:  ghc-transformers-prof
 BuildRequires:  ghc-vault-prof
-# for missing dep 'singleton-bool':
-BuildRequires:  ghc-dec-prof
 # End cabal-rpm deps
 
 %description
@@ -96,39 +89,22 @@ This package provides the Haskell %{pkg_name} profiling library.
 %endif
 
 
-%global main_version %{version}
-
-%if %{defined ghclibdir}
-%ghc_lib_subpackage %{singletonbool}
-%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 %{singletonbool}
-cabal-tweak-dep-ver base '<4.13' '<4.15'
-)
-
 
 %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
-%ghc_fix_rpath %{pkgver}
 # End cabal-rpm install
 
 
@@ -154,6 +130,9 @@ cabal-tweak-dep-ver base '<4.13' '<4.15'
 
 
 %changelog
+* Tue Mar 23 2021 Jens Petersen <petersen@redhat.com> - 0.16.2-7
+- singleton-bool is now packaged in Fedora
+
 * Wed Mar 17 2021 Jens Petersen <petersen@redhat.com> - 0.16.2-6
 - dec is now packaged in Fedora
 

sources

@@ -1,2 +1 @@
 SHA512 (servant-0.16.2.tar.gz) = 81e99308fb5740354f57600e7294f636e6cf988c6dbce6c4e0dd38bd7a2fad1dfe16e718ba74bcd59e8fb8a07c678c5da293a672160a01eee7b646a52c70a1bd
-SHA512 (singleton-bool-0.1.5.tar.gz) = a2b70137f598026d0b330a5ee8265f07056e2073544f62b60cba7fec2345796f5b0d295536a536877bcb01439401047a026d8234531e27431e38701711d5df1a