[cabal-dev/el6] Revert to F17 package

Jens Petersen petersen at fedoraproject.org
Mon Dec 10 09:17:38 UTC 2012


commit fc44b4365b1f0a99a6eb10420ad0b04ad8534891
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Dec 10 18:17:28 2012 +0900

    Revert to F17 package
    
    Reverting "build with tar-0.4 ; update with cabal-rpm"
    Reverting "- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild"
    Reverting "allow building with mtl-2.1 and transformers-0.3"
    Reverting "drop ghc_without_dynamic for patched ghc-7.4 Cabal"

 cabal-dev-0.9.1-mtl-transformers.patch |   19 ---------------
 cabal-dev-0.9.1-tar-0.4.patch          |   30 ------------------------
 cabal-dev.spec                         |   40 ++++++-------------------------
 3 files changed, 8 insertions(+), 81 deletions(-)
---
diff --git a/cabal-dev.spec b/cabal-dev.spec
index a0238f5..3580cec 100644
--- a/cabal-dev.spec
+++ b/cabal-dev.spec
@@ -1,34 +1,27 @@
+# cabal2spec-0.25.4
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 Name:           cabal-dev
 Version:        0.9.1
-Release:        5%{?dist}
-Summary:        Manage sandboxed Haskell build environments
+Release:        1%{?dist}
+Summary:        Haskell package sandboxing development tool
 
+Group:          Development/Tools
 License:        BSD
+# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-Patch1:         cabal-dev-0.9.1-tar-0.4.patch
-
+ExclusiveArch:  %{ghc_arches_with_ghci}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-# Begin cabal-rpm deps:
+# END cabal2spec
 BuildRequires:  ghc-HTTP-devel
-BuildRequires:  ghc-bytestring-devel
-BuildRequires:  ghc-containers-devel
-BuildRequires:  ghc-directory-devel
-BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
-BuildRequires:  ghc-pretty-devel
-BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-tar-devel
 BuildRequires:  ghc-template-haskell-devel
-BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-zlib-devel
-ExclusiveArch:  %{ghc_arches_with_ghci}
-# End cabal-rpm deps
 BuildRequires:  cabal-install
 Requires:       cabal-install
 
@@ -50,14 +43,10 @@ your sandboxed build environment.
 
 %prep
 %setup -q
-%patch1 -p1 -b .orig
-
-cabal-tweak-dep-ver mtl "< 2.1" "< 2.2"
-cabal-tweak-dep-ver transformers "< 0.3" "< 0.4"
-cabal-tweak-dep-ver tar ">= 0.3 && < 0.4" "== 0.4.*"
 
 
 %build
+%define ghc_without_dynamic 1
 %ghc_bin_build
 
 
@@ -75,19 +64,6 @@ cabal-tweak-dep-ver tar ">= 0.3 && < 0.4" "== 0.4.*"
 
 
 %changelog
-* Fri Nov  9 2012 Jens Petersen <petersen at redhat.com> - 0.9.1-5
-- patch to build with tar-0.4
-- update with cabal-rpm
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jun 10 2012 Jens Petersen <petersen at redhat.com> - 0.9.1-3
-- allow building with mtl-2.1 and transformers-0.3
-
-* Sat Mar 17 2012 Jens Petersen <petersen at redhat.com> - 0.9.1-2
-- drop ghc_without_dynamic for patched ghc-7.4 Cabal
-
 * Thu Feb  9 2012 Jens Petersen <petersen at redhat.com> - 0.9.1-1
 - update to 0.9.1
 - patches to buildsys for cabal-install no longer needed


More information about the scm-commits mailing list