From 61ea922f43c66bbedc0d3e742e036ffb6593dca8 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@fedoraproject.org>
Date: Thu, 26 Feb 2009 23:35:10 +0000
Subject: [PATCH] - update to cabal2spec-0.9: - add devel subpackage - use ix86
 macro for archs - use global rather than define

---
 ghc-zlib.spec | 48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/ghc-zlib.spec b/ghc-zlib.spec
index f14b787..27057be 100644
--- a/ghc-zlib.spec
+++ b/ghc-zlib.spec
@@ -1,26 +1,26 @@
 %define pkg_name zlib
 %define ghc_version 6.10.1
 
-%define pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%define pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
+%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
+%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
-%bcond_without prof
 %bcond_without doc
+%bcond_without prof
 
 # ghc does not emit debug information
-%define debug_package %{nil}
+%global debug_package %{nil}
 
 Name: ghc-%{pkg_name}
 Version: 0.5.0.0
-Release: 6%{?dist}
-License: BSD
+Release: 7%{?dist}
+Summary: Haskell compression and decompression library binding
+
 Group: Development/Libraries
+License: BSD
 URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-Summary: Haskell compression and decompression library binding
-Provides: %{name}-devel = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 x86_64 ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 BuildRequires: ghc = %{ghc_version}
 %if %{with doc}
 BuildRequires:  ghc-doc = %{ghc_version}
@@ -29,10 +29,6 @@ BuildRequires:  ghc-doc = %{ghc_version}
 BuildRequires:  ghc-prof = %{ghc_version}
 %endif
 BuildRequires: zlib-devel
-Requires: zlib-devel
-Requires: ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
 
 %description
 This package provides a pure Haskell interface for compressing and
@@ -44,6 +40,18 @@ It provides a convenient high level API suitable for most tasks.  For
 the few cases where more control is needed, it provides access to the
 full zlib feature set.
 
+%package devel
+Summary: Development libraries for %{name}
+Group: Development/Libraries
+Requires: zlib-devel
+Requires: ghc = %{ghc_version}
+Requires(post): ghc = %{ghc_version}
+Requires(preun): ghc = %{ghc_version}
+
+%description devel
+This package contains the development files for %{name}
+built for ghc-%{ghc_version}.
+
 
 %if %{with doc}
 %package doc
@@ -62,7 +70,7 @@ This package contains development documentation files for the %{name} library.
 %package prof
 Summary: Profiling libraries for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
 Requires: ghc-prof = %{ghc_version}
 
 %description prof
@@ -94,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
+%post devel
 %ghc_register_pkg
 
 
@@ -104,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 
-%preun 
+%preun devel
 if [ "$1" -eq 0 ] ; then
   %ghc_unregister_pkg
 fi
@@ -118,7 +126,7 @@ fi
 %endif
 
 
-%files -f %{name}.files
+%files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
 %doc LICENSE
 
@@ -137,6 +145,12 @@ fi
 
 
 %changelog
+* Fri Feb 27 2009 Jens Petersen <petersen@redhat.com> - 0.5.0.0-7
+- update to cabal2spec-0.9:
+- add devel subpackage
+- use ix86 macro for archs
+- use global rather than define
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild