From de19f0cc9c4b728533eac9f945719c5b67b50960 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Tue, 25 Oct 2005 00:38:31 +0000 Subject: [PATCH] - 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index a74bd92..c6d17c3 100644 --- a/evolution.spec +++ b/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 - 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 - 2.4.1-4 - updated patch 804 to declare e_calendar_table_process_completed_tasks