[packages/ganeti] - solve conflict between monad-tf and mtl packages by forcing use of snadard mtl package - rel 3

[baggins]

commit a09ee49fe7a133f712913bec7174635b174b0798
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Feb 4 00:34:43 2014 +0100

    - solve conflict between monad-tf and mtl packages by forcing use of snadard mtl package
    - rel 3

 ganeti.spec |  2 ++
 mtl.patch   | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
---
diff --git a/ganeti.spec b/ganeti.spec
index eb0cbc7..db4981a 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -17,6 +17,7 @@ Source8:	%{name}.sysconfig
 Patch0:		fix-no-kvm.patch
 Patch1:		systemd.patch
 Patch2:		daemon-util-use-service.patch
+Patch3:		mtl.patch
 URL:		https://code.google.com/p/ganeti/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -117,6 +118,7 @@ bash-completion for ganeti.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal} -I autotools
diff --git a/mtl.patch b/mtl.patch
new file mode 100644
index 0000000..9ae83c4
--- /dev/null
+++ b/mtl.patch
@@ -0,0 +1,21 @@
+--- ganeti-2.9.3/src/Ganeti/BasicTypes.hs~	2014-01-27 10:20:35.000000000 +0100
++++ ganeti-2.9.3/src/Ganeti/BasicTypes.hs	2014-02-04 00:03:58.709925227 +0100
+@@ -45,7 +45,7 @@
+ 
+ import Control.Applicative
+ import Control.Monad
+-import Control.Monad.Trans
++import "mtl" Control.Monad.Trans
+ import Data.Function
+ import Data.List
+ 
+--- ganeti-2.9.3/Makefile.am~	2014-02-03 22:26:36.193571670 +0100
++++ ganeti-2.9.3/Makefile.am	2014-02-04 00:05:22.467565093 +0100
+@@ -538,6 +538,7 @@
+ 	-O -Wall -Werror -isrc \
+ 	-fwarn-monomorphism-restriction \
+ 	-fwarn-tabs \
++	-XPackageImports \
+ 	$(GHC_BYVERSION_FLAGS)
+ 
+ # extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/a09ee49fe7a133f712913bec7174635b174b0798