[xfce4-mailwatch-plugin] Fix icon in 'Add new panel item' dialog (#694904)

[Christoph Wickert]

commit 8cc758cba7d89ed8755d6b4d8a37c0a527cf9d97
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Apr 9 21:07:20 2011 +0200

    Fix icon in 'Add new panel item' dialog (#694904)

 xfce4-mailwatch-plugin.spec |   48 ++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/xfce4-mailwatch-plugin.spec b/xfce4-mailwatch-plugin.spec
index 4bfe1cc..62d8b30 100644
--- a/xfce4-mailwatch-plugin.spec
+++ b/xfce4-mailwatch-plugin.spec
@@ -1,26 +1,30 @@
-Name:		xfce4-mailwatch-plugin
-Version:	1.1.0
-Release:	7%{?dist}
-Summary:	Mail Watcher plugin for the Xfce panel
-
-Group:		User Interface/Desktops
-License:	GPLv2
-URL:		http://spuriousinterrupt.org/projects/mailwatch
-Source0:	http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2
-Patch0:		xfce4-mailwatch-plugin-1.1.0-dsofix.patch
+# Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=187569
+
+%global panel-version %(rpm -q --qf='%{VERSION}' xfce4-panel)
+
+Name:           xfce4-mailwatch-plugin
+Version:        1.1.0
+Release:        8%{?dist}
+Summary:        Mail Watcher plugin for the Xfce panel
+
+Group:          User Interface/Desktops
+License:        GPLv2
+URL:            http://spuriousinterrupt.org/projects/mailwatch
+Source0:        http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2
+Patch0:         xfce4-mailwatch-plugin-1.1.0-dsofix.patch
 # Fixes underlinking against libxfcegui and libgcrypt
 # http://bugzilla.xfce.org/show_bug.cgi?id=7096
-Patch1:		xfce4-mailwatch-plugin-1.1.0-underlink.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         xfce4-mailwatch-plugin-1.1.0-underlink.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	gettext, libtool, xfce4-dev-tools
-BuildRequires:	libXt-devel
+BuildRequires:  xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.2, libxml2-devel
+BuildRequires:  gettext, libtool, xfce4-dev-tools
+BuildRequires:  libXt-devel
 # only enable TLS support if a recent version of gnutls is available
 %if 0%{?fedora} > 4
-BuildRequires:	gnutls-devel >= 1.2.0
+BuildRequires:  gnutls-devel >= 1.2.0
 %endif
-Requires:	xfce4-panel >= 4.4.0
+Requires:       xfce4-panel >= 4.4.0
 
 %description
 Mailwatch is a plugin for the Xfce 4 panel. It is intended to replace the 
@@ -31,6 +35,9 @@ local mailboxes in Mbox, Maildir and MH-Maildir format as well as Gmail.
 %setup -q
 %patch0 -p1 -b .dsofix
 %patch1 -p1 -b .underlink
+# Fix icon in 'Add new panel item' dialog
+sed -i 's|Icon=xfce-mail|Icon=mail-unread|g' panel-plugin/mailwatch.desktop.in.in
+
 
 %build
 # Xfce has its own autotools-running-script thingy, if you use autoreconf
@@ -53,8 +60,8 @@ 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 || :
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
@@ -77,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/doc/C/images/mailwatch-*.png
 
 %changelog
+* Fri Apr 08 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-8
+- Fix icon in 'Add new panel item' dialog (#694904)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild