From fac1963cb058fcf514d3c24e39fb6624a9ae0262 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Mar 2012 15:24:32 +0900 Subject: [PATCH] update to cabal2spec-0.25 --- ghc-zlib-bindings.spec | 46 +++++++++++++----------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/ghc-zlib-bindings.spec b/ghc-zlib-bindings.spec index 58d4751..ed8f28f 100644 --- a/ghc-zlib-bindings.spec +++ b/ghc-zlib-bindings.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 zlib-bindings @@ -10,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 0.0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -20,12 +20,8 @@ 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-bytestring-prof BuildRequires: ghc-zlib-prof @@ -33,21 +29,6 @@ BuildRequires: ghc-zlib-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} @@ -60,21 +41,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 - 0.0.3.2-2 +- update to cabal2spec-0.25 + * Tue Feb 28 2012 Ben Boeckel - 0.0.3.2-1 - Update to 0.0.3.2