diff --git a/ghc-resourcet.spec b/ghc-resourcet.spec index a19ebc9..4c65ae1 100644 --- a/ghc-resourcet.spec +++ b/ghc-resourcet.spec @@ -4,24 +4,19 @@ %global pkg_name resourcet %global pkgver %{pkg_name}-%{version} -%global unliftiocore unliftio-core-0.1.1.0 -%global subpkgs %{unliftiocore} - %bcond_without tests Name: ghc-%{pkg_name} Version: 1.1.10 -# can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Deterministic allocation and freeing of scarce resources License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{unliftiocore}/%{unliftiocore}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-containers-devel BuildRequires: ghc-exceptions-devel @@ -32,7 +27,7 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel -#BuildRequires: ghc-unliftio-core-devel +BuildRequires: ghc-unliftio-core-devel %if %{with tests} BuildRequires: ghc-hspec-devel %endif @@ -59,26 +54,15 @@ 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 %{unliftiocore} -%endif - -%global version %{main_version} - - %prep -%setup -q -n %{pkgver} -a1 +%setup -q -n %{pkgver} %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install @@ -103,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 23 2018 Jens Petersen - 1.1.10-3 +- unbundle unliftio-core + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild