From e28904af54d677729c2cbc391f8780b6949a88df Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Aug 19 2010 23:18:33 +0000
Subject: avoid file conflict


---

diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index dba662a..7d46a9f 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -9,7 +9,7 @@
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop3
 Version: 2.90.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.90/gnome-desktop-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -81,6 +81,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-about 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnome-about.desktop 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-about
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gnome-about*
 
 %find_lang %{po_package} --all-name --with-gnome
 
@@ -110,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-about
 %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
 
 %changelog
+* Thu Aug 19 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-2
+- Prevent file conflict with gnome-desktop
+
 * Tue Jun 29 2010 Matthias Clasen <mclasen@redhat.com> 2.90.4-1
 - Update to 2.90.4