[mate-desktop] obsolete mate-keyring for > f19

[Wolfgang Ulbrich]

commit b302574aedcac6d6264da113ffed71904e7b3a1f
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Oct 19 17:59:04 2013 +0200

    obsolete mate-keyring for > f19

 mate-desktop.spec |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 2e7b3b8..8cebc17 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -3,7 +3,7 @@
 Summary:        Shared code for mate-panel, mate-session, mate-file-manager, etc
 Name:           mate-desktop
 Version:        1.6.2
-Release:        0.6.git%{_internal_version}%{?dist}
+Release:        0.7.git%{_internal_version}%{?dist}
 URL:            http://mate-desktop.org
 
 # To generate tarball
@@ -36,11 +36,16 @@ Requires: xdg-user-dirs-gtk
 Requires: mate-control-center-filesystem
 Requires: mate-panel
 
-Obsoletes: libmate 
-Obsoletes: libmatecanvas 
-Obsoletes: libmatecomponent 
-Obsoletes: libmatecomponentui 
-Obsoletes: libmateui 
+Obsoletes: libmate
+Obsoletes: libmate-devel
+Obsoletes: libmatecanvas
+Obsoletes: libmatecanvas-devel
+Obsoletes: libmatecomponent
+Obsoletes: libmatecomponent-devel
+Obsoletes: libmatecomponentui
+Obsoletes: libmatecomponentui-devel
+Obsoletes: libmateui
+Obsoletes: libmateui-devel
 Obsoletes: mate-conf
 Obsoletes: mate-conf-devel
 Obsoletes: mate-conf-editor
@@ -50,6 +55,14 @@ Obsoletes: mate-mime-data-devel
 Obsoletes: mate-vfs
 Obsoletes: mate-vfs-devel
 Obsoletes: mate-vfs-smb
+# switch to gnome-keyring > f19
+%if 0%{?fedora} > 19
+Obsoletes: libmatekeyring
+Obsoletes: libmatekeyring-devel
+Obsoletes: mate-keyring
+Obsoletes: mate-keyring-pam
+Obsoletes: mate-keyring-devel
+%endif
 
 # temporarily solution for f20 until mate-bluetooth
 # is ported to bluez5
@@ -168,6 +181,9 @@ fi
 
 
 %changelog
+* Sat Oct 19 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-0.7.git81c245b
+- switch to gnome-keyring for > f19
+
 * Fri Oct 18 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.6.2.-0.6.git81c245b
 - Fix typo