[mail-notification/f16: 9/9] Merge branch 'master' into f16

[epienbro]

commit 28b33405f338c4eabb6bfca830e288dde31ae1fd
Merge: 441d446 bf59f4e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Dec 19 17:06:46 2011 +0100

    Merge branch 'master' into f16

 mail-notification-5.4-evolution-3-0-support.patch  |  156 ++++++++++++++++++--
 mail-notification-5.4-gtk3-support.patch           |    8 +-
 ...tion-5.4-make-properties-dialog-resizable.patch |   11 ++
 mail-notification-5.4-popup-attach.patch           |   14 +-
 ...revent-memory-corruption-in-tooltips-code.patch |   26 ++++
 mail-notification.spec                             |   66 +++++----
 6 files changed, 229 insertions(+), 52 deletions(-)
---
diff --cc mail-notification.spec
index 9f4fa7d,cbacbe4..04bdabb
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@@ -249,8 -231,25 +231,25 @@@ touch --no-create %{_datadir}/icons/hic
  
  
  %changelog
+ * Sat Dec 12 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-48
+ - The evolution plugin is now compatible with evolution 3.2 and 3.4
+ - Pack the list of evolution mail folders in a GtkScrolledWindow
+ - Made the mailbox properties dialog resizable
+ - Fixed a memory corruption issue in the tooltips code
+ - RHBZ #682584: Use the GConf macros as mentioned at 
+   https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#GConf
+ - Fixed a compatibility issue with libnotify 0.7 (attach-widget warnings)
+ - Dropped ancient obsoletes tags and triggers
+ - Dropped unneeded RPM tags
+ 
+ * Thu Nov 24 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-47
+ - Fixed compatibility with latest evolution
+ 
+ * Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 5.4-46
+ - Rebuild against newer evolution-data-server
+ 
  * Tue Aug 30 2011 Milan Crha <mcrha at redhat.com> - 5.4-45
 -- Sync version with f16 branch
 +- Rebuild against newer evolution-data-server (once again)
  
  * Mon Aug 29 2011 Milan Crha <mcrha at redhat.com> - 5.4-44
  - Rebuild against newer evolution-data-server