- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2,

and continued to be broken with 2.3/2.4) (#103826, again)

evolution.spec

@@ -27,7 +27,7 @@
 
 Name: evolution
 Version: 2.4.1
-Release: 4
+Release: 5
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -303,7 +303,7 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 # evolution is the preferred email app
 ln -sf ../desktop-menu-patches/redhat-evolution.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
 # just keep our desktop file (#103826)
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-2.0.desktop
+rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
 
 # evolution link
 ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
@@ -332,7 +332,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README
 %{_sysconfdir}/gconf/schemas/*
 %{_bindir}/*
-%{_datadir}/applications/*
+%{_datadir}/applications/redhat-evolution.desktop
 %{_datadir}/gnome/help/evolution-%{evo_major}
 %{_datadir}/idl/evolution-%{evo_major}
 %{_datadir}/mime-info/*
@@ -365,6 +365,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Mon Oct 24 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-5
+- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2, and
+  continued to be broken with 2.3/2.4) (#103826, again)
+
 * Tue Oct 18 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-4
 - updated patch 804 to declare e_calendar_table_process_completed_tasks