rpms/xfce4-mailwatch-plugin/F-13 xfce4-mailwatch-plugin.spec, 1.14, 1.15

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-mailwatch-plugin/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28799/F-13

Modified Files:
	xfce4-mailwatch-plugin.spec 
Log Message:
* Wed Feb 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-5
- Add patch to fix DSO linking (#564814)
- Update icon-cache scriptlets



Index: xfce4-mailwatch-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-mailwatch-plugin/F-13/xfce4-mailwatch-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfce4-mailwatch-plugin.spec	27 Jul 2009 07:52:36 -0000	1.14
+++ xfce4-mailwatch-plugin.spec	17 Feb 2010 14:30:20 -0000	1.15
@@ -1,19 +1,19 @@
 Name:		xfce4-mailwatch-plugin
 Version:	1.1.0
-Release:	4%{?dist}
+Release:	5%{?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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
 BuildRequires:	libXt-devel
 # only enable TLS support if a recent version of gnutls is available
-# install libXt for modular X
 %if 0%{?fedora} > 4
 BuildRequires:	gnutls-devel >= 1.2.0
 %endif
@@ -26,31 +26,39 @@ local mailboxes in Mbox, Maildir and MH-
 
 %prep
 %setup -q
+%patch0 -p1 -b .dsofix
+
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 
+
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 || :
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
@@ -62,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/doc/C/images/mailwatch-*.png
 
 %changelog
+* Wed Feb 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.0-5
+- Add patch to fix DSO linking (#564814)
+- Update icon-cache scriptlets
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild