diff --git a/ghc-distributive.spec b/ghc-distributive.spec index be023bb..99e459b 100644 --- a/ghc-distributive.spec +++ b/ghc-distributive.spec @@ -4,28 +4,26 @@ %global pkg_name distributive %global pkgver %{pkg_name}-%{version} -%global baseorphans base-orphans-0.5.4 %global cabaldoctest cabal-doctest-1 -%global subpkgs %{baseorphans} %{cabaldoctest} +%global subpkgs %{cabaldoctest} %bcond_with tests Name: ghc-%{pkg_name} Version: 0.5.2 # can only be reset when all subpkgs bumped -Release: 3%{?dist} +Release: 4%{?dist} Summary: Distributive functors -- Dual to Traversable 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/%{baseorphans}/%{baseorphans}.tar.gz -Source2: https://hackage.haskell.org/package/%{cabaldoctest}/%{cabaldoctest}.tar.gz +Source1: https://hackage.haskell.org/package/%{cabaldoctest}/%{cabaldoctest}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: -#BuildRequires: ghc-base-orphans-devel +BuildRequires: ghc-base-orphans-devel #BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-transformers-compat-devel @@ -56,7 +54,6 @@ This package provides the Haskell %{pkg_name} library development files. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{baseorphans} %ghc_lib_subpackage %{cabaldoctest} %endif @@ -64,7 +61,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkgver} -a1 -a2 +%setup -q -n %{pkgver} -a1 %build @@ -75,7 +72,6 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{subpkgs} %check @@ -99,6 +95,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Wed Sep 13 2017 Jens Petersen - 0.5.2-4 +- base-orphans is packaged now + * Wed Aug 02 2017 Fedora Release Engineering - 0.5.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild