[ghc-zlib-enum] update to cabal2spec-0.25.2

Jens Petersen petersen at fedoraproject.org
Thu Jan 5 12:20:43 UTC 2012


commit 4d078aabff3babad48b92b1850aa90952d3e7a42
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jan 5 21:20:37 2012 +0900

    update to cabal2spec-0.25.2

 ghc-zlib-enum.spec |   47 ++++++++++++-----------------------------------
 1 files changed, 12 insertions(+), 35 deletions(-)
---
diff --git a/ghc-zlib-enum.spec b/ghc-zlib-enum.spec
index 1823166..8b510f6 100644
--- a/ghc-zlib-enum.spec
+++ b/ghc-zlib-enum.spec
@@ -1,18 +1,16 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name zlib-enum
 
-# common part of summary for all the subpackages
 %global common_summary Enumerator interface for zlib compression
 
-# main description used for all the subpackages
 %global common_description This library provides Haskell enumeratees for zlib compression/decompression.
 
 Name:           ghc-%{pkg_name}
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -22,10 +20,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-enumerator-prof
 BuildRequires:  ghc-zlib-bindings-prof
@@ -34,22 +29,6 @@ BuildRequires:  ghc-zlib-bindings-prof
 %{common_description}
 
 
-%package -n ghc-%{pkg_name}-devel
-Summary:        Development files for %{common_summary}
-Group:          Development/Libraries
-# BEGIN cabal2spec
-%{?ghc_devel_requires}
-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 -n %{pkg_name}-%{version}
 
@@ -62,23 +41,21 @@ This package contains the development files.
 %ghc_lib_install
 
 
-%post -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
+%ghc_devel_package
 
+%ghc_devel_description
 
-%postun -n ghc-%{pkg_name}-devel
-%ghc_pkg_recache
 
+%ghc_devel_post_postun
 
-%if %{undefined ghc_without_shared}
-%files -n ghc-%{pkg_name} -f ghc-%{pkg_name}.files
-%endif
 
-
-%files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files
+%ghc_files
 
 
 %changelog
+* Thu Jan  5 2012 Jens Petersen <petersen at redhat.com> - 0.2.1-2
+- update to cabal2spec-0.25.2
+
 * Tue Nov  8 2011 Jens Petersen <petersen at redhat.com> - 0.2.1-1
 - MIT license, add description and deps
 


More information about the scm-commits mailing list