diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 28bbd08..0fc94a4 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -15,12 +15,9 @@ that other packages can use them without drawing in all of pandoc's\ dependencies, and pandoc itself can depend on packages (like\ citeproc-hs) that use them. -# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires) -%global ghc_pkg_deps ghc-syb-devel - Name: ghc-%{pkg_name} Version: 1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -29,11 +26,11 @@ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 -BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-Cabal-devel # macros for building haskell packages BuildRequires: ghc-rpm-macros BuildRequires: hscolour -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +BuildRequires: ghc-containers-prof, ghc-syb-prof %description %{common_description} @@ -57,8 +54,12 @@ BuildRequires: hscolour %changelog +* Wed May 11 2011 Jens Petersen - 1.8-2 +- drop ghc_package_deps +- add BR on ghc-Cabal-devel and ghc-containers-prof + * Tue May 3 2011 Jens Petersen - 1.8-1 -- +- GPLv2+ and depends on syb * Tue May 3 2011 Fedora Haskell SIG - 1.8-0 - initial packaging for Fedora automatically generated by cabal2spec-0.22.6