[meld] - Update to 1.3.2.

[Brian Pepple]

commit e6f529be176d55341a55d3f59a8d802513904fd6
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Mon Sep 6 16:39:54 2010 -0400

    - Update to 1.3.2.

 .gitignore              |    1 +
 meld-scrollkeeper.patch |   18 +++++++++---------
 meld.spec               |    8 ++++++--
 sources                 |    2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f61ee22..fcc0d0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 meld-1.3.1.tar.bz2
+/meld-1.3.2.tar.bz2
diff --git a/meld-scrollkeeper.patch b/meld-scrollkeeper.patch
index bd2800f..725a219 100644
--- a/meld-scrollkeeper.patch
+++ b/meld-scrollkeeper.patch
@@ -1,6 +1,6 @@
-diff -urp meld-1.2.1.OLD/help/C/GNUmakefile meld-1.2.1/help/C/GNUmakefile
---- meld-1.2.1.OLD/help/C/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
-+++ meld-1.2.1/help/C/GNUmakefile	2008-11-23 10:51:21.000000000 -0500
+diff -urp meld-1.3.2.orig/help/C/Makefile meld-1.3.2/help/C/Makefile
+--- meld-1.3.2.orig/help/C/Makefile	2010-06-24 17:31:33.000000000 -0400
++++ meld-1.3.2/help/C/Makefile	2010-09-06 16:09:15.029630001 -0400
 @@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
  
  .PHONY : all
@@ -25,9 +25,9 @@ diff -urp meld-1.2.1.OLD/help/C/GNUmakefile meld-1.2.1/help/C/GNUmakefile
  
  .PHONY : clean
  clean :
-diff -urp meld-1.2.1.OLD/help/es/GNUmakefile meld-1.2.1/help/es/GNUmakefile
---- meld-1.2.1.OLD/help/es/GNUmakefile	2007-02-17 13:40:05.000000000 -0500
-+++ meld-1.2.1/help/es/GNUmakefile	2008-11-23 10:51:54.000000000 -0500
+diff -urp meld-1.3.2.orig/help/es/Makefile meld-1.3.2/help/es/Makefile
+--- meld-1.3.2.orig/help/es/Makefile	2010-06-24 17:31:33.000000000 -0400
++++ meld-1.3.2/help/es/Makefile	2010-09-06 16:09:57.036630002 -0400
 @@ -11,7 +11,6 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
  
  .PHONY : all
@@ -52,9 +52,9 @@ diff -urp meld-1.2.1.OLD/help/es/GNUmakefile meld-1.2.1/help/es/GNUmakefile
  
  .PHONY : clean
  clean :
-diff -urp meld-1.2.1.OLD/help/fr/GNUmakefile meld-1.2.1/help/fr/GNUmakefile
---- meld-1.2.1.OLD/help/fr/GNUmakefile	2008-03-31 16:44:53.000000000 -0400
-+++ meld-1.2.1/help/fr/GNUmakefile	2008-11-23 10:54:18.000000000 -0500
+diff -urp meld-1.3.2.orig/help/fr/Makefile meld-1.3.2/help/fr/Makefile
+--- meld-1.3.2.orig/help/fr/Makefile	2010-06-24 17:31:33.000000000 -0400
++++ meld-1.3.2/help/fr/Makefile	2010-09-06 16:24:26.252630002 -0400
 @@ -11,24 +11,17 @@ INST_XML := $(helpdir_)/$(LANG)/meld.xml
  
  .PHONY : all
diff --git a/meld.spec b/meld.spec
index 89f0511..1d9ee35 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,6 +1,6 @@
 Name:		meld
-Version:	1.3.1
-Release:	3%{?dist}
+Version:	1.3.2
+Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
@@ -63,9 +63,13 @@ desktop-file-install --vendor fedora                    \
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 
 %changelog
+* Mon Sep  6 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.3.2-1
+- Update to 1.3.2.
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 1.3.1-3
 - recompiling .py files against Python 2.7 (rhbz#623335)
 
diff --git a/sources b/sources
index ace2bb2..1c91999 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05885811cf0bccc051c3f44938ff54ed  meld-1.3.1.tar.bz2
+7bd37cc8688a8cc2db68d26a2f186ff9  meld-1.3.2.tar.bz2