[ghc-X11] use _isa and update to cabal2spec-0.24.1

[Jens Petersen]

commit e0210302fde530c9a21108b993bc1915247308e6
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Dec 2 23:56:07 2011 +0900

    use _isa and update to cabal2spec-0.24.1

 ghc-X11.spec |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 deletions(-)
---
diff --git a/ghc-X11.spec b/ghc-X11.spec
index 803fb64..39d20c7 100644
--- a/ghc-X11.spec
+++ b/ghc-X11.spec
@@ -6,28 +6,48 @@
 documentation of these calls, refer to "The Xlib Programming\
 Manual", available online at <http://tronche.com/gui/x/xlib/>.
 
-%global ghc_pkg_c_deps libXinerama-devel, libX11-devel, libXext-devel
 
 Name:           ghc-%{pkg_name}
 Version:        1.5.0.0
-Release:        12%{?dist}.3
+Release:        13%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
+# BEGIN cabal2spec
 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
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+%endif
+# END cabal2spec
+BuildRequires:  libXinerama-devel%{?_isa}, libX11-devel%{?_isa}, libXext-devel%{?_isa}
 BuildRequires:  ghc-syb-prof
 
 %description
 %{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
+Requires:       libXinerama-devel%{?_isa}, libX11-devel%{?_isa}, libXext-devel%{?_isa}
+# 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}
 
@@ -40,10 +60,26 @@ BuildRequires:  ghc-syb-prof
 %ghc_lib_install
 
 
-%ghc_lib_package
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%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
 
 
 %changelog
+* Fri Dec  2 2011 Jens Petersen <petersen at redhat.com> - 1.5.0.0-13
+- use _isa and update to cabal2spec-0.24.1
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.5.0.0-12.3
 - rebuild with new gmp without compat lib