diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 9792707..3af11a0 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -4,24 +4,19 @@ %global pkg_name conduit-extra %global pkgver %{pkg_name}-%{version} -%global typedprocess typed-process-0.2.1.0 -%global subpkgs %{typedprocess} - %bcond_with tests Name: ghc-%{pkg_name} Version: 1.2.3.2 -# can only be reset when all subpkgs bumped -Release: 2%{?dist} +Release: 3%{?dist} Summary: Batteries included conduit: adapters for common libraries License: MIT Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{typedprocess}/%{typedprocess}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-async-devel BuildRequires: ghc-attoparsec-devel @@ -41,7 +36,7 @@ BuildRequires: ghc-streaming-commons-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel -#BuildRequires: ghc-typed-process-devel +BuildRequires: ghc-typed-process-devel BuildRequires: ghc-unliftio-core-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel @@ -81,26 +76,15 @@ Obsoletes: ghc-zlib-conduit-devel < 1.2 This package provides the Haskell %{pkg_name} library development files. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{typedprocess} -%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 @@ -125,6 +109,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Feb 23 2018 Jens Petersen - 1.2.3.2-3 +- unbundle typed-process + * Wed Feb 07 2018 Fedora Release Engineering - 1.2.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 9887252..0ce5afd 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (conduit-extra-1.2.3.2.tar.gz) = 758fe17c11be7eb82fe761be33cce68614bb148cec36486bb4903eed818f6a79b495788223447ec5fdff112d71a45f3b347db5c41fe6266c52021c7987839112 -SHA512 (typed-process-0.2.1.0.tar.gz) = d9a2f3a651a44c2887b165469a2d6409948cad3f1ebc90b55036ad8b0a186539064b09d35114225275d91b5f63e6c8e7e319c5816e79af69df47193877f1a867