[ghc-libmpd] allow building with mtl-2.1

Jens Petersen petersen at fedoraproject.org
Sat Jun 9 14:12:14 UTC 2012


commit 1971d2245bc4936c834b9043ce1f8821d215b212
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Jun 9 23:11:57 2012 +0900

    allow building with mtl-2.1

 ghc-libmpd.spec            |    7 ++++++-
 libmpd-0.7.2-mtl-2.1.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/ghc-libmpd.spec b/ghc-libmpd.spec
index bae4399..75dd124 100644
--- a/ghc-libmpd.spec
+++ b/ghc-libmpd.spec
@@ -10,7 +10,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.7.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -26,6 +26,7 @@ BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-network-prof
 BuildRequires:  ghc-time-prof
 BuildRequires:  ghc-utf8-string-prof
+Patch1:         libmpd-0.7.2-mtl-2.1.patch
 
 %description
 %{common_description}
@@ -33,6 +34,7 @@ BuildRequires:  ghc-utf8-string-prof
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
 
 
 %build
@@ -56,6 +58,9 @@ BuildRequires:  ghc-utf8-string-prof
 
 
 %changelog
+* Sat Jun  9 2012 Jens Petersen <petersen at redhat.com> - 0.7.2-3
+- allow building with mtl-2.1
+
 * Thu Mar 22 2012 Jens Petersen <petersen at redhat.com> - 0.7.2-2
 - add license to ghc_files
 
diff --git a/libmpd-0.7.2-mtl-2.1.patch b/libmpd-0.7.2-mtl-2.1.patch
new file mode 100644
index 0000000..66e9a2c
--- /dev/null
+++ b/libmpd-0.7.2-mtl-2.1.patch
@@ -0,0 +1,12 @@
+diff -u libmpd-0.7.2/libmpd.cabal\~ libmpd-0.7.2/libmpd.cabal
+--- libmpd-0.7.2/libmpd.cabal~	2012-03-03 22:52:00.256845067 +0900
++++ libmpd-0.7.2/libmpd.cabal	2012-06-09 23:09:37.157397579 +0900
+@@ -35,7 +35,7 @@
+ 
+ Library
+     Build-Depends:      base >= 4 && < 5,
+-                        mtl >= 2.0 && < 2.1,
++                        mtl >= 2.0 && < 2.2,
+                         network >= 2.1 && < 2.4,
+                         filepath >= 1.0 && < 1.4,
+                         utf8-string >= 0.3.1 && < 0.4,


More information about the scm-commits mailing list