commit 9e50c71e12f6d08193f6804e3f6fd362871c82db Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Wed Jul 19 22:58:25 2017 +0900
- up to 0.13.3 ghc-th-orphans-deps.patch | 11 -------- ghc-th-orphans.spec | 64 +++++++++++++++++++++++++---------------------- haddock.patch | 30 ---------------------- 3 files changed, 34 insertions(+), 71 deletions(-) --- diff --git a/ghc-th-orphans.spec b/ghc-th-orphans.spec index d60c7a9..33c92a4 100644 --- a/ghc-th-orphans.spec +++ b/ghc-th-orphans.spec @@ -6,41 +6,45 @@ Summary: Orphan instances for TH datatypes Summary(pl.UTF-8): Osierocone instancje typów danych TH Name: ghc-%{pkgname} -Version: 0.8 +Version: 0.13.3 Release: 1 License: BSD Group: Development/Languages #Source0Download: http://hackage.haskell.org/package/th-orphans Source0: http://hackage.haskell.org/package/%{pkgname}-%{version}/%{pkgname}-%{version}.tar.gz -# Source0-md5: a2de789100ad8d7e5be157b9cd4255d5 -Patch0: haddock.patch -Patch1: %{name}-deps.patch +# Source0-md5: d56c8222885e82e47076a27224fd4ced URL: http://hackage.haskell.org/package/th-orphans BuildRequires: ghc >= 6.12.3 -BuildRequires: ghc-base >= 4.2 -BuildRequires: ghc-base < 4.8 -BuildRequires: ghc-template-haskell >= 2.4 -BuildRequires: ghc-template-haskell < 2.10 -BuildRequires: ghc-th-lift >= 0.5 -BuildRequires: ghc-th-lift < 0.7 +BuildRequires: ghc-base >= 4.3 +BuildRequires: ghc-base < 5 +BuildRequires: ghc-generic-deriving >= 1.9 +BuildRequires: ghc-template-haskell +BuildRequires: ghc-th-lift >= 0.7.1 +BuildRequires: ghc-th-lift-instances +BuildRequires: ghc-th-reify-many >= 0.1 +BuildRequires: ghc-th-reify-many < 0.2 %if %{with prof} +BuildRequires: ghc-base-prof >= 4.3 +BuildRequires: ghc-base-prof < 5 +BuildRequires: ghc-generic-deriving-prof >= 1.9 BuildRequires: ghc-prof >= 6.12.3 -BuildRequires: ghc-base-prof >= 4.2 -BuildRequires: ghc-base-prof < 4.8 -BuildRequires: ghc-template-haskell-prof >= 2.4 -BuildRequires: ghc-template-haskell-prof < 2.10 -BuildRequires: ghc-th-lift-prof >= 0.5 -BuildRequires: ghc-th-lift-prof < 0.7 +BuildRequires: ghc-template-haskell-prof +BuildRequires: ghc-th-lift-instances-prof +BuildRequires: ghc-th-lift-prof >= 0.7.1 +BuildRequires: ghc-th-reify-many-prof >= 0.1 +BuildRequires: ghc-th-reify-many-prof < 0.2 %endif BuildRequires: rpmbuild(macros) >= 1.608 %requires_releq ghc Requires(post,postun): /usr/bin/ghc-pkg -Requires: ghc-base >= 4.2 -Requires: ghc-base < 4.8 -Requires: ghc-template-haskell >= 2.4 -Requires: ghc-template-haskell < 2.10 -Requires: ghc-th-lift >= 0.5 -Requires: ghc-th-lift < 0.7 +Requires: ghc-base >= 4.3 +Requires: ghc-base < 5 +Requires: ghc-generic-deriving >= 1.9 +Requires: ghc-template-haskell +Requires: ghc-th-lift >= 0.7.1 +Requires: ghc-th-lift-instances +Requires: ghc-th-reify-many >= 0.1 +Requires: ghc-th-reify-many < 0.2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # debuginfo is not useful for ghc @@ -64,12 +68,14 @@ Summary: Profiling %{pkgname} library for GHC Summary(pl.UTF-8): Biblioteka profilująca %{pkgname} dla GHC. Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: ghc-base-prof >= 4.2 -Requires: ghc-base-prof < 4.8 -Requires: ghc-template-haskell-prof >= 2.4 -Requires: ghc-template-haskell-prof < 2.10 -Requires: ghc-th-lift-prof >= 0.5 -Requires: ghc-th-lift-prof < 0.7 +Requires: ghc-base-prof >= 4.3 +Requires: ghc-base-prof < 5 +Requires: ghc-generic-deriving-prof >= 1.9 +Requires: ghc-template-haskell-prof +Requires: ghc-th-lift-instances-prof +Requires: ghc-th-lift-prof >= 0.7.1 +Requires: ghc-th-reify-many-prof >= 0.1 +Requires: ghc-th-reify-many-prof < 0.2 %description prof Profiling %{pkgname} library for GHC. Should be installed when @@ -81,8 +87,6 @@ kiedy potrzebujemy systemu profilującego z GHC. %prep %setup -q -n %{pkgname}-%{version} -%patch0 -p1 -%patch1 -p1 %build runhaskell Setup.hs configure -v2 \ diff --git a/ghc-th-orphans-deps.patch b/ghc-th-orphans-deps.patch deleted file mode 100644 index f66790e..0000000 --- a/ghc-th-orphans-deps.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- th-orphans-0.8/th-orphans.cabal.orig 2013-10-15 09:37:53.000000000 +0200 -+++ th-orphans-0.8/th-orphans.cabal 2013-12-24 08:08:26.469392370 +0100 -@@ -20,7 +20,7 @@ - - library - build-depends: base >= 4.2 && < 4.8, -- th-lift == 0.5.* -+ th-lift >= 0.5 && < 0.7 - - if impl(ghc >= 7.4) - Build-depends: template-haskell >= 2.7 && < 2.10 diff --git a/haddock.patch b/haddock.patch deleted file mode 100644 index 6154506..0000000 --- a/haddock.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- th-orphans-0.8/src/Language/Haskell/TH/Instances.hs.orig 2013-12-24 07:30:29.166154606 +0100 -+++ th-orphans-0.8/src/Language/Haskell/TH/Instances.hs 2013-12-24 08:07:10.199395571 +0100 -@@ -1,17 +1,17 @@ - {-# LANGUAGE CPP #-} - {-# LANGUAGE StandaloneDeriving, DeriveGeneric, TypeSynonymInstances, TemplateHaskell #-} - --{- | -- Module : Language.Haskell.TH.Instances.Lift -- Copyright : (c) Matt Morrow 2008 -- License : BSD3 -- Maintainer : Michael Sloan <mgsloan at gmail> -- Stability : experimental -- Portability : portable (template-haskell) -+-- | -+-- Module : Language.Haskell.TH.Instances.Lift -+-- Copyright : (c) Matt Morrow 2008 -+-- License : BSD3 -+-- Maintainer : Michael Sloan <mgsloan at gmail> -+-- Stability : experimental -+-- Portability : portable (template-haskell) -+-- -+-- Provides Ord and Lift instances for the TH datatypes. Also provides -+-- Show / Eq for Loc, and Ppr for Loc / Lit. - -- Provides Ord and Lift instances for the TH datatypes. Also provides -- Show / Eq for Loc, and Ppr for Loc / Lit. ---} - module Language.Haskell.TH.Instances () where - - import Language.Haskell.TH.Syntax ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ghc-th-orphans.git/commitdiff/9e50c71e12f6d08193f6804e3f6fd362871c82db _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit