rpms/xfdesktop/devel xfdesktop.spec,1.35,1.36

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6504/d

Modified Files:
	xfdesktop.spec 
Log Message:
* Sun Nov 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
- Fix dependency for default background image



Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- xfdesktop.spec	27 Jul 2009 07:59:12 -0000	1.35
+++ xfdesktop.spec	1 Nov 2009 05:06:21 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -18,9 +18,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Requires: xfwm4
 Requires: xfce4-panel
-Requires: desktop-backgrounds-basic
 Requires: xfce4-doc
 Requires: redhat-menus
+%if 0%{?fedora} <= 9
+Requires: desktop-backgrounds-basic
+%else
+Requires: desktop-backgrounds-compat
+%endif
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
@@ -65,12 +69,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_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 || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -90,6 +98,9 @@ touch --no-create %{_datadir}/icons/hico
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Sun Nov 01 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
+- Fix dependency for default background image
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild