[mate-notification-daemon/f20: 23/23] update to 1.8.1 release

[Wolfgang Ulbrich]

commit 9f364b7f2bf96c08af77f2501a70e2e60cd5a6eb
Merge: 3c5641c 9ffc755
Author: raveit65 <chat-to-me at raveit.de>
Date:   Thu Oct 23 01:56:18 2014 +0200

    update to 1.8.1 release

 .gitignore                    |   10 +++++++++
 mate-notification-daemon.spec |   42 ++++++++++++++++++++++++++--------------
 sources                       |    4 +++
 3 files changed, 41 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index 8e9b7fd,a64d1c2..ed81360
--- a/.gitignore
+++ b/.gitignore
@@@ -4,4 -4,10 +4,14 @@@
  /mate-notification-daemon-1.5.2.tar.xz
  /mate-notification-daemon-1.6.0.tar.xz
  /mate-notification-daemon-1.6.1.tar.xz
++<<<<<<< HEAD
 +/mate-notification-daemon-1.8.0.tar.xz
++=======
+ /mate-notification-daemon-1.7.0.git9f4203a.tar.xz
+ /mate-notification-daemon-1.7.0-git20131227-0280831.tar.xz
+ /mate-notification-daemon-1.7.0.tar.xz
+ /mate-notification-daemon-1.7.1.tar.xz
+ /mate-notification-daemon-1.7.90.tar.xz
+ /mate-notification-daemon-1.8.0.tar.xz
+ /mate-notification-daemon-1.8.1.tar.xz
++>>>>>>> f21
diff --cc mate-notification-daemon.spec
index 1cea9e3,de01608..a55b151
--- a/mate-notification-daemon.spec
+++ b/mate-notification-daemon.spec
@@@ -100,16 -94,40 +94,34 @@@ f
  
  
  %changelog
- * Fri Oct 03 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-3
+ * Thu Oct 23 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
+ - update to 1.8.1
+ - removed upreamed patch
+ 
+ * Fri Oct 03 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-4
  - try fix rhbz (#890728)
  
- * Sat Jul 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-2
- - update to 1.8.0 release
 -* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 -
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
+ * Wed Mar 05 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
+ - Update to 1.8.0
+ 
+ * Wed Feb 19 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.90-1
+ - update to 1.7.90
+ 
+ * Sat Jan 18 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.1-1
+ - update to 1.7.1
+ 
+ * Thu Jan 16 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.0-1
+ - update to 1.7.0
+ 
+ * Sat Dec 28 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.0-0.2.git20131227.0280831
+ - make maintainers life easier and use better git snapshot usage, thanks to Björn Esser
+ - use latest git snapshot, fix rhbz (#1046716)
+ - add missing changelog entry from package owner
+ - use --with-gnome --all-name for find locale
  - use modern 'make install' macro
- - add --with-gnome --all-name for find language
  
- * Fri Dec 27 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-2
- - fix mate part of rhbz (#1046716)
+ * Sat Dec 07 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.7.0-0.1.git9f4203a1
+ - update to latest git snapshot for rawhide
  
  * Fri Oct 25 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-1
  - update to 1.6.1 release
diff --cc sources
index 9288e80,a767cfd..f698154
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +f9cb50a86c30bccc8728adcbf6a04f32  mate-notification-daemon-1.8.0.tar.xz
++=======
+ 305d64a23982479575dfd169a00ff398  mate-notification-daemon-1.8.1.tar.xz
++>>>>>>> f21