Fix for #132050 (no entry for Evolution in the menus): use the new

redhat-evolution.desktop file provided by redhat-menus-1.13
This commit also adds a patch to CVS, though this patch is not used by the
    spec file.
This commit is contained in:
dmalcolm 2004-10-22 23:45:41 +00:00
parent 9ca31073e5
commit 8ff0f7b0af

View File

@ -38,7 +38,7 @@ ExcludeArch: s390x
Name: evolution Name: evolution
Version: 2.0.2 Version: 2.0.2
Release: 1 Release: 2
License: GPL License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/ URL: http://www.ximian.com/
@ -87,7 +87,7 @@ Requires: libbonoboui >= %{libbonoboui_version}
Requires: ORBit2 >= %{orbit2_version} Requires: ORBit2 >= %{orbit2_version}
Requires: spamassassin Requires: spamassassin
Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires: redhat-menus Requires: redhat-menus >= 1.13
BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
BuildRequires: libgal2-devel >= %{gal_version} BuildRequires: libgal2-devel >= %{gal_version}
@ -251,7 +251,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
# evolution is the preferred email app # evolution is the preferred email app
ln -sf ../desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ ln -sf ../desktop-menu-patches/redhat-evolution.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
# just keep our desktop file (#103826) # 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-2.0.desktop
@ -321,6 +321,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*/*.a %{_libdir}/evolution/%{evo_major}/*/*.a
%changelog %changelog
* Fri Oct 22 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.2-2
- Fix for #132050 (no entry for Evolution in the menus): use the new redhat-evolution.desktop file provided by redhat-menus-1.13
* Tue Oct 12 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.2-1 * Tue Oct 12 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.2-1
- Update from 2.0.1 to 2.0.2 - Update from 2.0.1 to 2.0.2
- Updated dependency on e-d-s from 1.0.1 to 1.0.2 - Updated dependency on e-d-s from 1.0.1 to 1.0.2