[ghc-glib] update to 0.12.2 and cabal2spec-0.25

[Jens Petersen]

commit 4e39bbea21137584a741861e941d306375206c2b
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Dec 27 15:40:50 2011 +0900

    update to 0.12.2 and cabal2spec-0.25

 .gitignore    |    1 +
 ghc-glib.spec |   51 +++++++++++++++++++++++++++++++++++++++------------
 sources       |    2 +-
 3 files changed, 41 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d697d3..3f42964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /glib-0.11.2.tar.gz
 /glib-0.12.0.tar.gz
 /glib-0.12.1.tar.gz
+/glib-0.12.2.tar.gz
diff --git a/ghc-glib.spec b/ghc-glib.spec
index 47ffd3f..024c5b9 100644
--- a/ghc-glib.spec
+++ b/ghc-glib.spec
@@ -4,14 +4,9 @@
 
 %global common_description Binding to the GLIB library for Gtk2Hs.
 
-%global ghc_pkg_c_deps glib2-devel%{?_isa}
-
-# obsolete old gtk2hs packages
-%global ghc_pkg_obsoletes ghc-gconf-devel < 0.11, ghc-gstreamer-devel < 0.11, ghc-svgcairo-devel < 0.11, ghc-gtk2hs-doc < 0.11
-
 Name:           ghc-%{pkg_name}
-Version:        0.12.1
-Release:        1%{?dist}.2
+Version:        0.12.2
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -20,17 +15,34 @@ 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
-BuildRequires:  hscolour
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  glib2-devel%{?_isa}
 BuildRequires:  gtk2hs-buildtools
-BuildRequires:  ghc-containers-prof, ghc-haskell98-prof
+BuildRequires:  ghc-containers-prof
+BuildRequires:  ghc-haskell98-prof
+# obsolete old gtk2hs packages
+Obsoletes:      ghc-gconf-devel < 0.11, ghc-gstreamer-devel < 0.11, ghc-svgcairo-devel < 0.11, ghc-gtk2hs-doc < 0.11
 
 %description
 %{common_description}
 
 
-%{?ghc_lib_package}
+%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:       glib2-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
@@ -45,7 +57,21 @@ BuildRequires:  ghc-containers-prof, ghc-haskell98-prof
 %ghc_lib_install
 
 
+%post -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%postun -n ghc-%{pkg_name}-devel
+%ghc_pkg_recache
+
+
+%ghc_files COPYING
+
+
 %changelog
+* Tue Dec 27 2011 Jens Petersen <petersen at redhat.com> - 0.12.2-1
+- update to 0.12.2 and cabal2spec-0.25
+
 * Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.12.1-1.2
 - rebuild with new gmp without compat lib
 
@@ -54,6 +80,7 @@ BuildRequires:  ghc-containers-prof, ghc-haskell98-prof
 
 * Tue Sep 20 2011 Jens Petersen <petersen at redhat.com> - 0.12.1-1
 - update to 0.12.1
+- add _isa suffix to gtk2-devel depends (see #723558)
 
 * Tue Jun 21 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-5
 - BR ghc-Cabal-devel instead of ghc-prof (cabal2spec-0.23.1)
diff --git a/sources b/sources
index 9762e3c..08cf3ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ec61fc88876c127949adea6ed528328  glib-0.12.1.tar.gz
+5d8a04be9a975fb70c6508f95aeb3265  glib-0.12.2.tar.gz