rpms/evolution/devel evolution-2.11.92-icon-names.patch, 1.2, 1.3 evolution.spec, 1.292, 1.293

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13590

Modified Files:
	evolution-2.11.92-icon-names.patch evolution.spec 
Log Message:

* Wed Sep 19 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.0-3.fc8
- Re-enable the inline audio plugin since it now uses GStreamer 0.10.


evolution-2.11.92-icon-names.patch:

Index: evolution-2.11.92-icon-names.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.11.92-icon-names.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.11.92-icon-names.patch	19 Sep 2007 12:06:27 -0000	1.2
+++ evolution-2.11.92-icon-names.patch	19 Sep 2007 14:53:43 -0000	1.3
@@ -1329,7 +1329,7 @@
 -	E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) ,
 +	E_PIXMAP ("/commands/DeleteAll", "edit-delete", 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/FileSave", "document-save", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU),
@@ -1409,7 +1409,7 @@
  	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/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/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU),
  	
@@ -1518,7 +1518,7 @@
  
  static EPixmap pixmaps[] = {
 +	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/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
 +	E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
@@ -1526,7 +1526,7 @@
 +	E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU),
 +
 +	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 ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU),
  


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- evolution.spec	19 Sep 2007 12:06:27 -0000	1.292
+++ evolution.spec	19 Sep 2007 14:53:43 -0000	1.293
@@ -19,7 +19,7 @@
 %define evo_major 2.12
 
 %define exchange_support 1
-%define inline_audio_support 0
+%define inline_audio_support 1
 %define ldap_support 1
 %define libnotify_support 1
 %define krb5_support 1
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -185,7 +185,7 @@
 
 %if %{inline_audio_support}
 # audio-inline plugin requires gstreamer to build:
-BuildRequires: gstreamer08-devel
+BuildRequires: gstreamer-devel
 %endif
 
 %if %{ldap_support} 
@@ -708,10 +708,10 @@
 %files help -f help.lang
 %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
+* Wed Sep 19 2007 Matthew Barnes <mbarnes at 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 at redhat.com> - 2.12.0-2.fc8
 - Revise patch for GNOME bug #477045 (less-zealous icon renaming).