[meld/f14/master] Merge Christophs changes from master: Update to 1.5.1 Run gtk-update-icon-cache after (un)install Ad

[Dominic Hopf]

commit c8446cb866cf3ae5a42fa0e62777d4f5ed829b0d
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Apr 17 18:00:18 2011 +0200

    Merge Christophs changes from master:
    Update to 1.5.1
    Run gtk-update-icon-cache after (un)install
    Add NEWS to %doc

 .gitignore              |    3 ++
 meld-scrollkeeper.patch |   83 -----------------------------------------------
 meld.spec               |   56 +++++++++++++++++++++++++------
 sources                 |    2 +-
 4 files changed, 49 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcc0d0d..8a98a38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 meld-1.3.1.tar.bz2
 /meld-1.3.2.tar.bz2
+/meld-1.4.0.tar.bz2
+/meld-1.5.0.tar.bz2
+/meld-1.5.1.tar.bz2
diff --git a/meld.spec b/meld.spec
index 1d9ee35..2b66634 100644
--- a/meld.spec
+++ b/meld.spec
@@ -1,13 +1,12 @@
 Name:		meld
-Version:	1.3.2
+Version:	1.5.1
 Release:	1%{?dist}
 Summary:	Visual diff and merge tool
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		http://meld.sourceforge.net/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.3/%{name}-%{version}.tar.bz2
-Patch1:		%{name}-scrollkeeper.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.5/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -19,6 +18,7 @@ BuildRequires:	perl(XML::Parser)
 Requires:	pygtk2 >= 2.8.0
 Requires:	pygtk2-libglade
 Requires:	pygobject2 >= 2.8.0
+Requires:	patch
 
 BuildArch:	noarch
 
@@ -32,7 +32,6 @@ tabbed interface that allows you to open many diffs at once.
 
 %prep
 %setup -q
-%patch1 -p1 -b .scrollkeeper
 
 
 %build
@@ -43,30 +42,65 @@ make prefix=%{_prefix} libdir=%{_datadir}
 rm -rf ${RPM_BUILD_ROOT}
 
 make prefix=%{_prefix} libdir=%{_datadir} \
-  DESTDIR=${RPM_BUILD_ROOT} install
+  DESTDIR=${RPM_BUILD_ROOT} install INSTALL='install -p'
 
-
-desktop-file-install --vendor fedora                    \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --delete-original                                     \
+desktop-file-install --vendor fedora					\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
+  --delete-original										\
+  --add-category="GTK"									\
+  --remove-category="Application"						\
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING
+%doc AUTHORS COPYING NEWS
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 
 %changelog
+* Sun Apr 16 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 1.5.1-1
+- Merge Christophs changes from master:
+- Update to 1.5.1
+- Run gtk-update-icon-cache after (un)install
+- Add NEWS to %%doc
+
+* Sun Mar 13 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 1.5.0-2
+- remove the scrollkeeper patch
+- add requirement for patch (fixes rhbz#651815)
+
+* Sun Mar 13 2011 Dominic Hopf <dmaphy at fedoraproject.org> - 1.5.0-1
+- New upstream release: Meld 1.5
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Oct 20 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.4.0-1
+- Update to 1.4.0.
+- Update source url.
+
 * Mon Sep  6 2010 Brian Pepple <bpepple at fedoraproject.org> - 1.3.2-1
 - Update to 1.3.2.
 
diff --git a/sources b/sources
index 1c91999..f12fdd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7bd37cc8688a8cc2db68d26a2f186ff9  meld-1.3.2.tar.bz2
+387f24c936e2a433ac3dedd298008675  meld-1.5.1.tar.bz2