[ghc-derive] update with cabal-rpm

Jens Petersen petersen at fedoraproject.org
Sat Nov 17 13:40:30 UTC 2012


commit 9c1986dbe0606cabf2abd55bc86fe758582dafba
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Nov 17 22:40:23 2012 +0900

    update with cabal-rpm

 ghc-derive.spec |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/ghc-derive.spec b/ghc-derive.spec
index ac676de..22ee46d 100644
--- a/ghc-derive.spec
+++ b/ghc-derive.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -6,22 +5,20 @@
 
 %global common_summary  Library to derive instances for data types
 
-%global common_description Derive is a library and tool for deriving instances for Haskell programs.
+%global common_description Derive is a library and a tool for deriving instances for Haskell programs.
 
 Name:           ghc-%{pkg_name}
 Version:        2.5.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        %{common_summary}
 
-Group:          System Environment/Libraries
 License:        BSD
-# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-ExclusiveArch:  %{ghc_arches_with_ghci}
+
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
@@ -33,6 +30,8 @@ BuildRequires:  ghc-syb-devel
 BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-transformers-devel
 BuildRequires:  ghc-uniplate-devel
+ExclusiveArch:  %{ghc_arches_with_ghci}
+# End cabal-rpm deps
 
 %description
 %{common_description}
@@ -50,7 +49,6 @@ BuildRequires:  ghc-uniplate-devel
 %ghc_lib_install
 
 
-# devel subpackage
 %ghc_devel_package
 
 %ghc_devel_description
@@ -64,6 +62,9 @@ BuildRequires:  ghc-uniplate-devel
 
 
 %changelog
+* Sat Nov 17 2012 Jens Petersen <petersen at redhat.com> - 2.5.8-7
+- update with cabal-rpm
+
 * Fri Nov  2 2012 Jens Petersen <petersen at redhat.com> - 2.5.8-6
 - use ghc_arches_with_ghci for template-haskell
 


More information about the scm-commits mailing list