[mate-notification-daemon/epel7: 18/18] Merge branch 'master' into epel7

[Dan Mashal]

commit 59b3bfbf355f88f3139367ff04a04cfef3c3413c
Merge: 585444c 846b93c
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Mar 18 02:06:11 2014 -0700

    Merge branch 'master' into epel7

 .gitignore                    |    6 ++++
 mate-notification-daemon.spec |   66 ++++++++++++++++++++++++++++++++---------
 sources                       |    2 +-
 3 files changed, 59 insertions(+), 15 deletions(-)
---
diff --cc mate-notification-daemon.spec
index 03fc345,9c2b3fe..50dba6f
--- a/mate-notification-daemon.spec
+++ b/mate-notification-daemon.spec
@@@ -10,15 -30,10 +30,14 @@@ BuildRequires:  dbus-glib-deve
  BuildRequires:  desktop-file-utils
  BuildRequires:  libcanberra-devel
  BuildRequires:  libnotify-devel
- BuildRequires:  libmatewnck-devel
+ BuildRequires:  libwnck-devel
  BuildRequires:  mate-common
  BuildRequires:  mate-desktop-devel
- BuildRequires:  mate-doc-utils
  
 +# fix rhbz (#1046716)
 +# https://github.com/mate-desktop/mate-notification-daemon/pull/26
 +Patch0:         mate-notification-daemon_check-value-type-of-notification-hint.patch
 +
  Provides:       desktop-notification-daemon
  
  %description