[leksah/f17] leksah update to 0.12.1.2 deleted: haddock.patch modified: leksah.spec modified: leksah_de

[narasim]

commit b371492ba0ee72be794a67ecf19525f265662a25
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Sat Jun 23 00:37:31 2012 +0530

    leksah update to 0.12.1.2
    	deleted:    haddock.patch
    	modified:   leksah.spec
    	modified:   leksah_dep.patch

 haddock.patch    |   17 -----------------
 leksah.spec      |   16 +++++++++++-----
 leksah_dep.patch |   31 ++++++++++---------------------
 3 files changed, 21 insertions(+), 43 deletions(-)
---
diff --git a/leksah.spec b/leksah.spec
index be0565d..b6a88b2 100644
--- a/leksah.spec
+++ b/leksah.spec
@@ -10,7 +10,7 @@
 Haskell written in Haskell. Leksah uses GTK+ as GUI Toolkit.
 
 Name:           %{pkg_name}
-Version:        0.12.1.0
+Version:        0.12.1.2
 Release:        1%{?dist}
 Summary:        Haskell IDE
 Group:          Development/Tools
@@ -33,8 +33,9 @@ Requires: hicolor-icon-theme
 Requires: leksah-server
 
 # patches
-Patch1: leksah_dep.patch
-Patch2: haddock.patch
+#Patch1: leksah_dep.patch
+#Patch2: haddock.patch
+Patch3: dep.patch
 
 %description
 %{common_description}
@@ -42,8 +43,9 @@ Patch2: haddock.patch
 
 %prep
 %setup -q
-%patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
+#%patch1 -p1 -b .orig
+#%patch2 -p1 -b .orig
+%patch3 -p1 -b .orig
 
 
 %build
@@ -117,6 +119,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun 22 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.1.2-1
+- update to 0.12.1.2
+- haddock patch is not required anymore
+
 * Mon Jun 11 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.12.1.0-1
 - update to 0.12.1.0
 
diff --git a/leksah_dep.patch b/leksah_dep.patch
index 45f0b68..70323c2 100644
--- a/leksah_dep.patch
+++ b/leksah_dep.patch
@@ -1,24 +1,23 @@
---- 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:34:44.324995980 +0530
+--- leksah-0.12.1.2_orig/leksah.cabal	2012-06-22 23:39:04.066169397 +0530
++++ leksah-0.12.1.2/leksah.cabal	2012-06-23 00:10:47.146768929 +0530
 @@ -123,7 +123,7 @@
-                        hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.0 && <0.13, network >= 2.2 && <3.0,
+                        hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.2 && <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.4,
 -                       QuickCheck >=2.4.2 && <2.5
-+                       QuickCheck
++                       QuickCheck 
  
      exposed-modules:
          IDE.Leksah IDE.Completion IDE.ImportTool
-@@ -193,11 +193,38 @@
-                        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,
+@@ -197,10 +197,38 @@
+                        hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.2 && <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.4,
+                        gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
 -                       QuickCheck >=2.4.2 && <2.5
-+                       gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,QuickCheck
++                       QuickCheck
      else
 -        hs-source-dirs: main
--        build-depends: leksah ==0.12.1.0, base >=4.0.0.0 && <= 5
+-        build-depends: leksah ==0.12.1.2, 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,
@@ -27,7 +26,7 @@
 +                       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.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,
++                       hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.2 && <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.4, QuickCheck
 +
@@ -52,13 +51,3 @@
  
      default-language: Haskell98
      main-is: Main.hs
-@@ -211,8 +238,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,
--                   leksah ==0.12.1.0
-+    build-depends: base >= 4.0.0.0 && <4.6, Cabal >=1.6.0.1 && <1.15, QuickCheck,leksah ==0.12.1.0
- 
- 
-