rpms/ghc-zlib/devel ghc-zlib.spec,1.7,1.8

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27357

Modified Files:
	ghc-zlib.spec 
Log Message:
- update to cabal2spec-0.9:
- add devel subpackage
- use ix86 macro for archs
- use global rather than define





Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc-zlib.spec	24 Feb 2009 21:17:49 -0000	1.7
+++ ghc-zlib.spec	26 Feb 2009 23:35:10 -0000	1.8
@@ -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-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 @@
 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 @@
 %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
 
 
-%post
+%post devel
 %ghc_register_pkg
 
 
@@ -104,7 +112,7 @@
 %endif
 
 
-%preun 
+%preun devel
 if [ "$1" -eq 0 ] ; then
   %ghc_unregister_pkg
 fi
@@ -118,7 +126,7 @@
 %endif
 
 
-%files -f %{name}.files
+%files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
 %doc LICENSE
 
@@ -137,6 +145,12 @@
 
 
 %changelog
+* Fri Feb 27 2009 Jens Petersen <petersen at 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 at lists.fedoraproject.org> - 0.5.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild