From 23392ad0215190d824a18235e706034149dfd341 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 04:37:08 +0000
Subject: auto-import changelog data from evolution-1.0.8-9.src.rpm

Thu Aug 29 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-9
- don't install two desktop files (#72871)

---

diff --git a/evolution.spec b/evolution.spec
index 88168d5..2f15f33 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -15,7 +15,7 @@ ExcludeArch: ia64 alpha
 
 Name: evolution
 Version: 1.0.8
-Release: 8
+Release: 9
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -174,12 +174,12 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
 
 # vfolder desktop file install stuff
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
-desktop-file-install --vendor gnome --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications       \
-  --add-category X-Red-Hat-Extra                      \
-  --add-category Network                              \
-  --add-category Application                          \
-  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/evolution.desktop
+#desktop-file-install --vendor gnome --delete-original \
+#  --dir $RPM_BUILD_ROOT%{_datadir}/applications       \
+#  --add-category X-Red-Hat-Extra                      \
+#  --add-category Network                              \
+#  --add-category Application                          \
+#  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/evolution.desktop
 
 # evolution is the preferred email app
 ln -sf %{_datadir}/desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
@@ -220,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 29 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-9
+- don't install two desktop files (#72871)
+
 * Wed Aug 28 2002 Preston Brown <pbrown@redhat.com> 1.0.8-8
 - absolute symlink .desktop file (#72913)