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

- Re-enable the inline audio plugin since it now uses GStreamer 0.10.

Browse Source
This commit is contained in:
Matthew Barnes 2007-09-19 14:53:43 +00:00
parent bf63603195
commit 9f4ab9ae5a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
evolution-2.11.92-icon-names.patch
View File

@ -1329,7 +1329,7 @@ diff -up evolution-2.12.0/composer/e-msg-composer.c.icon-names evolution-2.12.0/
- E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , - E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
+ E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FileClose", "dialog-close", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU),
@ -1409,7 +1409,7 @@ diff -up evolution-2.12.0/shell/e-shell-window-commands.c.icon-names evolution-2
E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU), E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU),
E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU),
- E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/menu/File/FileClose", "dialog-close", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU),
@ -1518,7 +1518,7 @@ diff -up evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names evolutio
static EPixmap pixmaps[] = { static EPixmap pixmaps[] = {
+ E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/FileClose", "dialog-close", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
@ -1526,7 +1526,7 @@ diff -up evolution-2.12.0/calendar/gui/dialogs/comp-editor.c.icon-names evolutio
+ E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU),
+ +
+ E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/FileClose", "dialog-close", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),

12
evolution.spec
View File

@ -19,7 +19,7 @@
%define evo_major 2.12 %define evo_major 2.12
%define exchange_support 1 %define exchange_support 1
%define inline_audio_support 0 %define inline_audio_support 1
%define ldap_support 1 %define ldap_support 1
%define libnotify_support 1 %define libnotify_support 1
%define krb5_support 1 %define krb5_support 1
@ -45,7 +45,7 @@
Name: evolution Name: evolution
Version: 2.12.0 Version: 2.12.0
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 and GFDL+ License: GPLv2 and GFDL+
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -185,7 +185,7 @@ BuildRequires: openssl-devel
%if %{inline_audio_support} %if %{inline_audio_support}
# audio-inline plugin requires gstreamer to build: # audio-inline plugin requires gstreamer to build:
BuildRequires: gstreamer08-devel BuildRequires: gstreamer-devel
%endif %endif
%if %{ldap_support} %if %{ldap_support}
@ -708,10 +708,10 @@ rm -rf $RPM_BUILD_ROOT
%files help -f help.lang %files help -f help.lang
%dir %{_datadir}/omf/evolution %dir %{_datadir}/omf/evolution
# Look into re-enabling the inline-audio plugin once 2.12 ships.
# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629).
%changelog %changelog
* Wed Sep 19 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-3.fc8
- Re-enable the inline audio plugin since it now uses GStreamer 0.10.
* Wed Sep 19 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-2.fc8 * Wed Sep 19 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-2.fc8
- Revise patch for GNOME bug #477045 (less-zealous icon renaming). - Revise patch for GNOME bug #477045 (less-zealous icon renaming).