From 267ce3020f40326935352af1632effd54ad5cd05 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Wed, 4 Jan 2012 16:50:14 +0900
Subject: [PATCH] update to 0.7.0 and cabal2spec-0.25.2

---
 .gitignore              |  1 +
 ghc-libmpd.spec         | 42 ++++++++++++++++++++++++++---------------
 libmpd-0.5.0-ghc7.patch | 19 -------------------
 sources                 |  2 +-
 4 files changed, 29 insertions(+), 35 deletions(-)
 delete mode 100644 libmpd-0.5.0-ghc7.patch

diff --git a/.gitignore b/.gitignore
index 060f60f..6292b39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libmpd-0.4.2.tar.gz
 /libmpd-0.5.0.tar.gz
+/libmpd-0.7.0.tar.gz
diff --git a/ghc-libmpd.spec b/ghc-libmpd.spec
index 793ec57..8b08296 100644
--- a/ghc-libmpd.spec
+++ b/ghc-libmpd.spec
@@ -1,35 +1,38 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name libmpd
 
-%global common_summary An MPD client library
+%global common_summary Haskell MPD client library
 
 %global common_description A client library for MPD, the Music Player Daemon.
 
 Name:           ghc-%{pkg_name}
-Version:        0.5.0
-Release:        9%{?dist}.3
+Version:        0.7.0
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        LGPLv2
+# 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
-BuildRequires:  hscolour
-BuildRequires:  ghc-mtl-prof, ghc-network-prof, ghc-time-prof, ghc-utf8-string-prof
-Patch1:         libmpd-0.5.0-ghc7.patch
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  ghc-mtl-prof
+BuildRequires:  ghc-network-prof
+BuildRequires:  ghc-time-prof
+BuildRequires:  ghc-utf8-string-prof
 
 %description
 %{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
 
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
-%patch1 -p1 -b .orig
 
 
 %build
@@ -38,15 +41,24 @@ This package provides the shared library.
 
 %install
 %ghc_lib_install
-mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}
-install -p ChangeLog %{buildroot}/%{_docdir}/%{name}-%{version}/ChangeLog
-install -p README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README.md
 
 
-%{?ghc_lib_package}
+%ghc_devel_package
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files
+%doc README.md
 
 
 %changelog
+* Wed Jan  4 2012 Jens Petersen <petersen@redhat.com> - 0.7.0-1
+- update to 0.7.0 and cabal2spec-0.25.2
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.5.0-9.3
 - rebuild with new gmp without compat lib
 
diff --git a/libmpd-0.5.0-ghc7.patch b/libmpd-0.5.0-ghc7.patch
deleted file mode 100644
index 43232f7..0000000
--- a/libmpd-0.5.0-ghc7.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up libmpd-0.5.0/libmpd.cabal.orig libmpd-0.5.0/libmpd.cabal
---- libmpd-0.5.0/libmpd.cabal.orig	2010-09-08 23:47:02.000000000 +1000
-+++ libmpd-0.5.0/libmpd.cabal	2010-12-05 19:55:32.000000000 +1000
-@@ -41,11 +41,11 @@ Library
-     else
-         Build-Depends: base >= 4 && < 5
- 
--    Build-Depends:      network >= 2.1 && < 2.3,
--                        mtl >= 1.1 && < 1.2, filepath >= 1.0 && < 1.2,
-+    Build-Depends:      network >= 2.1 && < 2.4,
-+                        mtl >= 1.1 && < 2.1, filepath >= 1.0 && < 1.3,
-                         utf8-string >= 0.3.1 && < 0.4,
--                        containers >= 0.3 && < 0.4,
--                        time >= 1.1 && < 1.2,
-+                        containers >= 0.3 && < 0.5,
-+                        time >= 1.1 && < 1.3,
-                         old-locale >= 1.0 && < 1.1
-     Exposed-Modules:    Network.MPD, Network.MPD.Commands.Extensions,
-                         Network.MPD.Core
diff --git a/sources b/sources
index 0a9a3cf..759dca6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38771e38d93ed511340c3c171df3dd75  libmpd-0.5.0.tar.gz
+c82b959f1ec4a6c4bbdd9dc77b419d2b  libmpd-0.7.0.tar.gz