Drop the "Email Settings" capplet.

This commit is contained in:
Matthew Barnes 2011-05-09 15:21:34 -04:00
parent 894b5f1577
commit 54f2caef64

View File

@ -28,7 +28,7 @@
Name: evolution
Version: 3.1.1
Release: 1%{?dist}
Release: 2%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -299,6 +299,13 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
# Remove the 'email-settings' capplet. The thing was added for MeeGo
# to complement Express mode and, frankly, looks horrible. It doesn't
# belong on a GNOME 3 desktop.
rm $RPM_BUILD_ROOT%{_bindir}/evolution-settings
rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop
rm $RPM_BUILD_ROOT%{_libdir}/evolution/${evo_base_version}/libevolution-mail-settings.*
%find_lang evolution-%{evo_base_version} --all-name --with-gnome
grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang
@ -396,11 +403,8 @@ rm -rf $RPM_BUILD_ROOT
# The main executable
%{_bindir}/evolution
%{_bindir}/evolution-settings
# Desktop files:
%{_datadir}/applications/evolution.desktop
%{_datadir}/applications/evolution-settings.desktop
%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
# Icons:
@ -451,7 +455,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.*
%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.*
%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.*
%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.*
%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.*
%{_libdir}/evolution/%{evo_base_version}/libfilter.so.*
%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so.*
@ -583,7 +586,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so
%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so
%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so
%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so
%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so
%{_libdir}/evolution/%{evo_base_version}/libfilter.so
%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so
@ -621,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Mon May 09 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.1-2
- Drop the "Email Settings" capplet.
* Mon May 09 2011 Milan Crha <mcrha@redhat.com> - 3.1.1-1
- Update to 3.1.1
- Drop groupwise plugin, as it was split out upstream