rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- use 4 separate .desktop files from the redhat-menus package, rather than

Browse Source 
the current single one; bump the redhat-menus requirement accordingly
    (from 1.13 to 5.0.4); introduce a macro for this requirement.
This commit is contained in:
dmalcolm 2005-10-25 23:23:21 +00:00
parent de19f0cc9c
commit 554d9c8da8
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
evolution.spec
View File

@ -25,9 +25,11 @@
%define nntp_support 1
%define exchange_support 1
%define redhat_menus_version 5.0.4
Name: evolution
Version: 2.4.1
Release: 5
Release: 6
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/
@ -96,7 +98,7 @@ Requires: libbonoboui >= %{libbonoboui_version}
Requires: ORBit2 >= %{orbit2_version}
Requires: spamassassin
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires: redhat-menus >= 1.13
Requires: redhat-menus >= %{redhat_menus_version}
Requires: gnutls
Requires: dbus >= %{dbus_version}
Requires: libgnomeprint22 >= %{libgnomeprint22_version}
@ -301,8 +303,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
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)
ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
# remove upstream desktop file; use the symlinks from above (#103826)
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
# evolution link
@ -332,7 +338,10 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
%{_sysconfdir}/gconf/schemas/*
%{_bindir}/*
%{_datadir}/applications/redhat-evolution.desktop
%{_datadir}/applications/redhat-evolution-mail.desktop
%{_datadir}/applications/redhat-evolution-calendar.desktop
%{_datadir}/applications/redhat-evolution-contacts.desktop
%{_datadir}/applications/redhat-evolution-tasks.desktop
%{_datadir}/gnome/help/evolution-%{evo_major}
%{_datadir}/idl/evolution-%{evo_major}
%{_datadir}/mime-info/*
@ -365,6 +374,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/*.so
%changelog
* Tue Oct 25 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-6
- use 4 separate .desktop files from the redhat-menus package, rather than the
current single one; bump the redhat-menus requirement accordingly (from 1.13
to 5.0.4); introduce a macro for this requirement.
* 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)