From f0eff29a89690e52d5bade6b998d4a08a4af9e55 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Fri, 8 Oct 2004 23:31:39 +0000 Subject: [PATCH] - Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop - Added requirement on redhat-menus, since this supplies the target of our .desktop symlink --- evolution.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7afd8a8..e1a2a43 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ ExcludeArch: ppc64 Name: evolution Version: 2.0.1 -Release: 2 +Release: 3 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -88,6 +88,7 @@ Requires: libbonoboui >= %{libbonoboui_version} Requires: ORBit2 >= %{orbit2_version} Requires: spamassassin Requires: gnome-icon-theme >= %{gnome_icon_theme_version} +Requires: redhat-menus BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: libgal2-devel >= %{gal_version} @@ -253,7 +254,7 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # evolution is the preferred email app ln -sf ../desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ # just keep our desktop file (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-2.0.desktop # evolution link ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution @@ -321,6 +322,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/*/*.a %changelog +* Fri Oct 8 2004 David Malcolm - 2.0.1-3 +- Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop +- Added requirement on redhat-menus, since this supplies the target of our .desktop symlink + * Tue Sep 28 2004 David Malcolm - 2.0.1-2 - update mozilla dependency from 1.7.2 to 1.7.3, apart from on ppc (and on s390 and s390x, which remain at 1.6, and on ppc64 where it isn't available at all)