[leksah: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/leksah

[narasim]

commit 6842c19327e544ab99fced613702fdcee3883260
Merge: bffc5c3 5f7b946
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Sun Jan 8 12:19:31 2012 +0530

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/leksah
    
    Conflicts:
    	leksah.spec

 leksah.desktop             |    7 +++--
 leksah.spec                |   31 +++++++++++++++++++++++------
 leksah.xml                 |   45 ++++++++++++++++++++++++++++++++++++++++++++
 leksah_loadsession.desktop |   12 +++++++++++
 4 files changed, 85 insertions(+), 10 deletions(-)
---
diff --cc leksah.spec
index 673efbe,80d4175..9927e9d
--- a/leksah.spec
+++ b/leksah.spec
@@@ -13,7 -13,7 +13,7 @@@ Haskell written in Haskell. Leksah use
  
  Name:           %{pkg_name}
  Version:        0.10.0.4
- Release:        6%{?dist}
 -Release:        6%{?dist}.2
++Release:        7%{?dist}
  Summary:        Haskell IDE
  Group:          Development/Tools
  # LICENSE file is GPLv2 while sources only mention GPL, hence GPL+.
@@@ -144,9 -151,16 +151,19 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
- * Sun Jan 08 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-6
++* Sun Jan 08 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-7
 +- Rebuild for haskell-platform
 +
+ * Fri Oct 21 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.10.0.4-6.2
+ - rebuild with new gmp without compat lib
+ 
+ * Wed Oct 12 2011 Peter Schiffer <pschiffe at redhat.com> - 0.10.0.4-6.1
+ - rebuild with new gmp
+ 
+ * Mon Oct 10 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-6
+ - Fix bug 744559.
+ - Added leksah.xml to mime database.
+ 
  * Sun Sep 25 2011  Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.10.0.4-5
  - Upgrade to cabal2spec-0.24.1
  - Rebuild for gtk2hs updates