[cpphs] update to cabal2spec-0.25.2

[Jens Petersen]

commit 5edca5fde05147dc41250b86ad1d2dd1ef1d47af
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jan 19 17:22:14 2012 +0900

    update to cabal2spec-0.25.2

 cpphs.spec |   76 ++++++++++++++++-------------------------------------------
 1 files changed, 21 insertions(+), 55 deletions(-)
---
diff --git a/cpphs.spec b/cpphs.spec
index 402ffde..602eae1 100644
--- a/cpphs.spec
+++ b/cpphs.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name cpphs
 
 %global common_summary Haskell %{pkg_name} library
@@ -11,11 +15,12 @@ compatible with traditional (K&R) pre-processors. Additional features\
 include: a plain-text mode; an option to unlit literate code files; and\
 an option to turn off macro-expansion.
 
+# avoid redundant copy of GPL license in lib package
 %global ghc_exclude_docdir 1
 
 Name:           %{pkg_name}
 Version:        1.13.2
-Release:        2%{?dist}.1
+Release:        3%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
@@ -24,10 +29,7 @@ URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros >= 0.13.12
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
 BuildRequires:  ghc-haskell98-prof
 
@@ -35,42 +37,6 @@ BuildRequires:  ghc-haskell98-prof
 %{common_description}
 
 
-%if %{undefined ghc_without_shared}
-%package -n ghc-%{pkg_name}
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-License:        LGPLv2+
-# 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}
-%{common_description}
-
-This package contains the shared library.
-%endif
-
-
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-License:        LGPLv2+
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-Obsoletes:      ghc-%{pkg_name}-prof < %{version}-%{release}
-Provides:       ghc-%{pkg_name}-prof = %{version}-%{release}
-# END cabal2spec
-# remember to require any C devel dependency here
-# Haskell devel dependencies are autogenerated by ghc-deps.sh
-
-%description -n ghc-%{pkg_name}-devel
-%{common_description}
-
-This package contains the development files.
-
-
 %prep
 %setup -q
 
@@ -84,13 +50,19 @@ This package contains the development files.
 rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENCE-LGPL
 
 
+%ghc_package
+License:        LGPLv2+
+
+%ghc_description
+
+
+%ghc_devel_package
+License:        LGPLv2+
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_description
 
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_post_postun
 
 
 %files
@@ -98,19 +70,13 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENCE-LGPL
 %{_bindir}/%{name}
 
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%doc LICENCE-LGPL
-%endif
-
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
-%if %{defined ghc_without_shared}
-%doc LICENCE-LGPL
-%endif
+%ghc_files LICENCE-LGPL
 
 
 %changelog
+* Thu Jan 19 2012 Jens Petersen <petersen at redhat.com> - 1.13.2-3
+- update to cabal2spec-0.25.2, fixing anomalous ghc-cpphs requires ghc-compiler
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13.2-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild