[ghc-neither] update to cabal2spec-0.25

[Jens Petersen]

commit 0ae0ab6b60a25b6346c99bc5cce8e6e81eee1656
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Mar 23 00:03:31 2012 +0900

    update to cabal2spec-0.25

 ghc-neither.spec |   45 ++++++++++++++-------------------------------
 1 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/ghc-neither.spec b/ghc-neither.spec
index 7faa9cb..ab9bacb 100644
--- a/ghc-neither.spec
+++ b/ghc-neither.spec
@@ -1,6 +1,6 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name neither
 
@@ -27,7 +27,7 @@ and MEitherT is a monad transformer.
 
 Name:           ghc-%{pkg_name}
 Version:        0.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -37,10 +37,7 @@ 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}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
 
 BuildRequires:  ghc-failure-prof
@@ -50,21 +47,6 @@ BuildRequires:  ghc-transformers-prof
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -77,21 +59,22 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+# devel subpackage
+%ghc_devel_package
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
 
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%endif
+%ghc_devel_post_postun
 
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+
+%ghc_files LICENSE
 
 
 %changelog
+* Sun Mar 18 2012 Jens Petersen <petersen at redhat.com> - 0.3.1-2
+- update to cabal2spec-0.25
+
 * Tue Feb 28 2012 Ben Boeckel <mathstuf at gmail.com> - 0.3.1-1
 - Update to 0.3.1