lifted-async needs constraints but drop explicit deps

Revert "no longer depends on constraints"

This reverts commit 1b3eb762ef.
This commit is contained in:
Jens Petersen 2019-08-06 12:57:59 +08:00
parent 1b3eb762ef
commit 73b4f751f3
2 changed files with 7 additions and 6 deletions

View File

@ -5,14 +5,15 @@
%global pkgver %{pkg_name}-%{version} %global pkgver %{pkg_name}-%{version}
%global liftedasync lifted-async-0.10.0.3 %global liftedasync lifted-async-0.10.0.3
%global subpkgs %{liftedasync} %global constraints constraints-0.10.1
%global subpkgs %{constraints} %{liftedasync}
%bcond_with tests %bcond_with tests
Name: ghc-%{pkg_name} Name: ghc-%{pkg_name}
Version: 1.8.1 Version: 1.8.1
# can only be reset when all subpkgs bumped # can only be reset when all subpkgs bumped
Release: 7%{?dist} Release: 6%{?dist}
Summary: Shell-like (systems) programming in Haskell Summary: Shell-like (systems) programming in Haskell
License: BSD License: BSD
@ -20,6 +21,7 @@ Url: https://hackage.haskell.org/package/%{pkg_name}
# Begin cabal-rpm sources: # Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{liftedasync}/%{liftedasync}.tar.gz Source1: https://hackage.haskell.org/package/%{liftedasync}/%{liftedasync}.tar.gz
Source2: https://hackage.haskell.org/package/%{constraints}/%{constraints}.tar.gz
# End cabal-rpm sources # End cabal-rpm sources
# Begin cabal-rpm deps: # Begin cabal-rpm deps:
@ -108,6 +110,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%if %{defined ghclibdir} %if %{defined ghclibdir}
%ghc_lib_subpackage %{liftedasync} %ghc_lib_subpackage %{liftedasync}
%ghc_lib_subpackage %{constraints}
%endif %endif
%global version %{main_version} %global version %{main_version}
@ -115,7 +118,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%prep %prep
# Begin cabal-rpm setup: # Begin cabal-rpm setup:
%setup -q -n %{pkgver} -a1 %setup -q -n %{pkgver} -a1 -a2
# End cabal-rpm setup # End cabal-rpm setup
@ -159,9 +162,6 @@ This package provides the Haskell %{pkg_name} profiling library.
%changelog %changelog
* Tue Aug 6 2019 Jens Petersen <petersen@redhat.com> - 1.8.1-7
- drop constraints subpackage
* Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 1.8.1-6 * Fri Aug 02 2019 Jens Petersen <petersen@redhat.com> - 1.8.1-6
- add doc and prof subpackages (cabal-rpm-1.0.0) - add doc and prof subpackages (cabal-rpm-1.0.0)

View File

@ -1,2 +1,3 @@
SHA512 (constraints-0.10.1.tar.gz) = 77aefa0656cd48ab7b01cc1ca724fd5f02679838cad4cdf2a0f267e91cf4dc0fbe3f908d1eb3f6cee821e9403fec4afc78db1f145fe1f642030db30deb4ff181
SHA512 (shelly-1.8.1.tar.gz) = 75a6939ed0c395950738d569d2452b55acc373ead0361e97651218ec464816fffa1af5808b7af4d2ea7cd4339c028a4a1bee02f0bfd88fecb73a6888c083d651 SHA512 (shelly-1.8.1.tar.gz) = 75a6939ed0c395950738d569d2452b55acc373ead0361e97651218ec464816fffa1af5808b7af4d2ea7cd4339c028a4a1bee02f0bfd88fecb73a6888c083d651
SHA512 (lifted-async-0.10.0.3.tar.gz) = 93adf5d07609cbd8852f36377274c0051a9da396622ee9aed325e708724478b0d7ce6fde3a5560a6a78134b1ba9e6ddc3619979d46b2efcdfe739c3df11c02eb SHA512 (lifted-async-0.10.0.3.tar.gz) = 93adf5d07609cbd8852f36377274c0051a9da396622ee9aed325e708724478b0d7ce6fde3a5560a6a78134b1ba9e6ddc3619979d46b2efcdfe739c3df11c02eb