From 7932471f73ee5ea97881dd2cba514c52abc3a52e Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Fri, 7 Jun 2013 12:27:36 +0900
Subject: [PATCH] update to new simplified Haskell Packaging Guidelines

---
 ghc-glib.spec | 57 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/ghc-glib.spec b/ghc-glib.spec
index 7f428b4..b4dfbe5 100644
--- a/ghc-glib.spec
+++ b/ghc-glib.spec
@@ -1,18 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name glib
 
-%global common_summary Binding to the GLIB library for Gtk2Hs
-
-%global common_description The GNU Library is a collection of C data structures and utility functions for\
-dealing with Unicode. This package only binds as much functionality as required\
-to support the packages that wrap libraries that are themselves based on GLib.
-
 Name:           ghc-%{pkg_name}
 Version:        0.12.4
-Release:        2%{?dist}
-Summary:        %{common_summary}
+Release:        3%{?dist}
+Summary:        Binding to the GLIB library for Gtk2Hs
 
 License:        LGPLv2+
 URL:            http://hackage.haskell.org/package/%{pkg_name}
@@ -22,12 +15,32 @@ BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-containers-devel
-# End cabal-rpm deps
 BuildRequires:  gtk2hs-buildtools
-BuildRequires:  glib2-devel%{?_isa}
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gobject-2.0)
+# End cabal-rpm deps
 
 %description
-%{common_description}
+The GNU Library is a collection of C data structures and utility functions for
+dealing with Unicode. This package only binds as much functionality as required
+to support the packages that wrap libraries that are themselves based on GLib.
+
+
+%package devel
+Summary:        Haskell %{pkg_name} library development files
+Requires:       ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires:       %{name} = %{version}-%{release}
+# Begin cabal-rpm deps:
+Requires:       pkgconfig(glib-2.0)
+Requires:       pkgconfig(gobject-2.0)
+# End cabal-rpm deps
+# 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 devel
+This package provides the Haskell %{pkg_name} library development files.
 
 
 %prep
@@ -42,21 +55,25 @@ BuildRequires:  glib2-devel%{?_isa}
 %ghc_lib_install
 
 
-%ghc_devel_package
-Requires:       glib2-devel%{?_isa}
-# 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
-
-%ghc_devel_description
+%post devel
+%ghc_pkg_recache
 
 
-%ghc_devel_post_postun
+%postun devel
+%ghc_pkg_recache
 
 
-%ghc_files COPYING
+%files -f %{name}.files
+%doc COPYING
+
+
+%files devel -f %{name}-devel.files
 
 
 %changelog
+* Fri Jun 07 2013 Jens Petersen <petersen@redhat.com> - 0.12.4-3
+- update to new simplified Haskell Packaging Guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild