[leksah/f17] applied new patches new file: haddock.patch modified: leksah.spec modified: leksah_dep.patc

[narasim]

commit ea07734126f10b31fe49412facf2cc5785334a56
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Mon Mar 12 16:27:50 2012 +0530

    applied new patches
    	new file:   haddock.patch
    	modified:   leksah.spec
    	modified:   leksah_dep.patch

 haddock.patch    |   17 +++++++++++++++++
 leksah.spec      |    6 +++++-
 leksah_dep.patch |    5 +++--
 3 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/haddock.patch b/haddock.patch
new file mode 100644
index 0000000..ba3f4df
--- /dev/null
+++ b/haddock.patch
@@ -0,0 +1,17 @@
+--- leksah-0.12.0.3_old/src/IDE/SymbolNavigation.hs	2012-03-12 15:02:10.648974351 +0530
++++ leksah-0.12.0.3/src/IDE/SymbolNavigation.hs	2012-03-12 16:03:36.235100048 +0530
+@@ -50,10 +50,10 @@
+     deriving (Ord,Eq,Show)
+ 
+ createHyperLinkSupport  ::
+-        SourceView ->                     -- ^ source buffer view
+-        ScrolledWindow ->               -- ^ container window
+-        (Bool -> Bool -> TextIter -> IO (TextIter, TextIter)) ->     -- ^ identifiermapper (bools=control,shift)
+-        (Bool -> Bool -> String -> IO ()) ->                            -- ^ click handler
++        SourceView ->                     --  source buffer view
++        ScrolledWindow ->               --  container window
++        (Bool -> Bool -> TextIter -> IO (TextIter, TextIter)) ->     --  identifiermapper (bools=control,shift)
++        (Bool -> Bool -> String -> IO ()) ->                            --  click handler
+         IO [Connection]
+ createHyperLinkSupport sv sw identifierMapper clickHandler = do
+     let tv = castToTextView sv
diff --git a/leksah.spec b/leksah.spec
index e8b45d3..f071e8b 100644
--- a/leksah.spec
+++ b/leksah.spec
@@ -39,7 +39,8 @@ Requires: hicolor-icon-theme
 Requires: leksah-server
 
 # patches
-Patch1 : leksah_dep.patch
+Patch1: leksah_dep.patch
+Patch2: haddock.patch
 
 %description
 %{common_description}
@@ -84,6 +85,7 @@ This package contains the development files.
 %prep
 %setup -q
 %patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
 
 
 %build
@@ -114,10 +116,12 @@ install --mode=0644 -D %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/mime/packages
 %dir %{_datadir}/%{name}-%{version}
 %dir %{_datadir}/%{name}-%{version}/data
 %dir %{_datadir}/%{name}-%{version}/pics
+%dir %{_datadir}/%{name}-%{version}/language-specs
 %attr(644,root,root) %{_datadir}/%{name}-%{version}/LICENSE
 %attr(644,root,root) %{_datadir}/%{name}-%{version}/Readme
 %attr(644,root,root) %{_datadir}/%{name}-%{version}/pics/*
 %attr(644,root,root) %{_datadir}/%{name}-%{version}/data/*
+%attr(644,root,root) %{_datadir}/%{name}-%{version}/language-specs/*
 %attr(644,root,root) %{_datadir}/applications/%{name}.desktop
 %attr(644,root,root) %{_datadir}/applications/%{name}_loadsession.desktop
 %attr(644,root,root) %{_datadir}/mime/packages/leksah.xml
diff --git a/leksah_dep.patch b/leksah_dep.patch
index 18b834f..a525f4a 100644
--- a/leksah_dep.patch
+++ b/leksah_dep.patch
@@ -1,5 +1,5 @@
 --- 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:37:40.888032598 +0530
++++ leksah-0.12.0.3/leksah.cabal	2012-03-12 15:43:35.763319764 +0530
 @@ -123,7 +123,7 @@
                         hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.0.3 && <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,
@@ -16,8 +16,9 @@
 -                       QuickCheck >=2.4.2 && <2.5
 +                       QuickCheck
      else
-         hs-source-dirs: main
+-        hs-source-dirs: main
 -        build-depends: leksah ==0.12.0.3, 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,