[leksah/f17] Update patch for cabal deps modified: leksah.spec modified: leksah_dep.patch

[narasim]

commit b8d1fafb6e80196e3d71fe9a5a11812147ac0bec
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Mon Jun 11 21:15:56 2012 +0530

    Update patch for cabal deps
    	modified:   leksah.spec
    	modified:   leksah_dep.patch

 leksah.spec      |    5 +++--
 leksah_dep.patch |   33 +++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/leksah.spec b/leksah.spec
index 87e13c4..be0565d 100644
--- a/leksah.spec
+++ b/leksah.spec
@@ -33,6 +33,7 @@ Requires: hicolor-icon-theme
 Requires: leksah-server
 
 # patches
+Patch1: leksah_dep.patch
 Patch2: haddock.patch
 
 %description
@@ -41,6 +42,7 @@ Patch2: haddock.patch
 
 %prep
 %setup -q
+%patch1 -p1 -b .orig
 %patch2 -p1 -b .orig
 
 
@@ -115,9 +117,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Sun Jun 10 2012 Jens Petersen <petersen at redhat.com> - 0.12.1.0-1
+* Mon Jun 11 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.1.0-1
 - update to 0.12.1.0
-- deps patch is no longer needed
 
 * Tue Mar 20 2012 Jens Petersen <petersen at redhat.com> - 0.12.0.3-3
 - update to cabal2spec-0.25
diff --git a/leksah_dep.patch b/leksah_dep.patch
index a525f4a..70ea451 100644
--- a/leksah_dep.patch
+++ b/leksah_dep.patch
@@ -1,34 +1,34 @@
---- leksah-0.12.0.3_old/leksah.cabal	2012-03-12 15:02:10.562974279 +0530
-+++ leksah-0.12.0.3/leksah.cabal	2012-03-12 15:43:35.763319764 +0530
+--- leksah-0.12.1.0_old/leksah.cabal	2012-06-04 23:05:45.000000000 +0530
++++ leksah-0.12.1.0/leksah.cabal	2012-06-11 21:09:41.686935373 +0530
 @@ -123,7 +123,7 @@
-                        hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.0.3 && <0.13, network >= 2.2 && <3.0,
+                        hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.0 && <0.13, network >= 2.2 && <3.0,
                         ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
-                        gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.3,
+                        gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
 -                       QuickCheck >=2.4.2 && <2.5
 +                       QuickCheck
  
      exposed-modules:
          IDE.Leksah IDE.Completion IDE.ImportTool
 @@ -194,10 +194,39 @@
-                        hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.0.3 && <0.13, network >= 2.2 && <3.0,
+                        hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.0 && <0.13, network >= 2.2 && <3.0,
                         ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
-                        gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.3,
+                        gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
 -                       QuickCheck >=2.4.2 && <2.5
 +                       QuickCheck
      else
 -        hs-source-dirs: main
--        build-depends: leksah ==0.12.0.3, base >=4.0.0.0 && <= 5
+-        build-depends: leksah ==0.12.1.0, base >=4.0.0.0 && <= 5
 +        hs-source-dirs: src, main
 +        build-depends: Cabal >=1.6.0.1 && <1.15, base >=4.0.0.0 && <4.6, binary >=0.5.0.0 && <0.6,
 +                       bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
 +                       filepath >=1.1.0.1 && <1.4, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
-+                       gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.1, old-time >=1.0.0.1 && <1.2,
++                       gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.2, old-time >=1.0.0.1 && <1.2,
 +                       parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
 +                       regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.5,
-+                       time >=0.1 && <1.5, ltk >=0.12 && <0.13, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,
-+                       hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.0.3 && <0.13, network >= 2.2 && <3.0,
++                       time >=0.1 && <1.5, ltk >= 0.12.1.0 && <0.13, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,
++                       hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.0 && <0.13, network >= 2.2 && <3.0,
 +                       ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
-+                       gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.3,
++                       gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
 +                       QuickCheck
 +
 +    other-modules:
@@ -50,5 +50,14 @@
 +        IDE.Build
 +        Paths_leksah
  
+     default-language: Haskell98
      main-is: Main.hs
-     buildable: True
+@@ -211,7 +240,7 @@
+     type:       exitcode-stdio-1.0
+     hs-source-dirs: tests
+     main-is:    Tests.hs
+-    build-depends: base >= 4.0.0.0 && <4.6, Cabal >=1.6.0.1 && <1.15, QuickCheck >=2.4.2 && <2.5,
++    build-depends: base >= 4.0.0.0 && <4.6, Cabal >=1.6.0.1 && <1.15, QuickCheck
+                    leksah ==0.12.1.0
+ 
+