[mate-power-manager] add mate-power-manager_switch-to-gnome-keyring.patch to spec file

Wolfgang Ulbrich raveit65 at fedoraproject.org
Sat Oct 19 16:23:38 UTC 2013


commit 7766c7ee5d01e587207d7cea9bcc6c90e605f4d7
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Oct 19 18:23:32 2013 +0200

    add mate-power-manager_switch-to-gnome-keyring.patch to spec file

 mate-power-manager.spec |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index 09b0c38..b104e3e 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -2,7 +2,7 @@
 
 Name:          mate-power-manager
 Version:       1.6.3
-Release:       0.2.git%{_internal_version}%{?dist}
+Release:       0.3.git%{_internal_version}%{?dist}
 Summary:       MATE power management service
 License:       GPLv2+
 URL:           http://pub.mate-desktop.org
@@ -20,6 +20,11 @@ Patch0:        mate-power-manager_dbus_interface_keyboard_backlight_controls.pat
 # https://github.com/mate-desktop/mate-power-manager/pull/82
 # fix mouse click on brightness applet, rhbz (#1018915)
 Patch1:        mate-power-manager_fix-mouse-click-on-brightness-applet.patch
+# swithch to gnome-keyring > f19
+# http://git.mate-desktop.org/mate-power-manager/commit/?id=5064f93
+%if 0%{?fedora} > 19
+Patch2:        mate-power-manager_switch-to-gnome-keyring.patch
+%endif
 
 BuildRequires: cairo-devel
 BuildRequires: dbus-glib-devel
@@ -27,7 +32,11 @@ BuildRequires: desktop-file-utils
 BuildRequires: libcanberra-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
+%if 0%{?fedora} > 19
+BuildRequires: libgnome-keyring-devel
+%else
 BuildRequires: libmatekeyring-devel
+%endif
 BuildRequires: libnotify-devel
 BuildRequires: mate-common
 BuildRequires: mate-control-center-devel
@@ -54,6 +63,9 @@ displaying icons and handling user callbacks in an interactive MATE session.
 
 %patch0 -p1 -b .dbus
 %patch1 -p1 -b .brightness
+%if 0%{?fedora} > 19
+%patch2 -p1 -b .gnome-keyring
+%endif
 
 # nedded to create missing configure and make files
 NOCONFIGURE=1 ./autogen.sh
@@ -124,6 +136,9 @@ fi
 
 
 %changelog
+* Sat Oct 19 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-0.3.gitbc54d96
+- switch to gnome-keyring for > f19
+
 * Mon Oct 14 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-0.2.gitbc54d96
 - fix mouse click on brightness applet, rhbz (#1018915)
 


More information about the scm-commits mailing list