[packages/mate-power-manager] up to 1.6.1

[glen]

commit 224f5aa8fa461d4f747abff5c8801bb7c0ec2b8e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed May 15 23:19:03 2013 +0300

    up to 1.6.1

 mate-power-manager.spec | 12 +++++++++---
 use-gnome-keyring.patch | 16 ++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index f709fae..a5e3d27 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -4,12 +4,12 @@
 
 Summary:	MATE power management service
 Name:		mate-power-manager
-Version:	1.6.0
+Version:	1.6.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-# Source0-md5:	d91d3fe90b9aeebe6dfe1636e1951a26
+# Source0-md5:	de091940b4696108daea32ef64ec9926
 Patch1:		use-gnome-keyring.patch
 Patch4:		uidir.patch
 URL:		http://wiki.mate-desktop.org/mate-power-manager
@@ -20,6 +20,9 @@ BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	docbook-utils
 BuildRequires:	glib2-devel
 BuildRequires:	gtk+2-devel >= 2:2.17.7
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
 BuildRequires:	libcanberra-devel
 BuildRequires:	libcanberra-gtk-devel
 BuildRequires:	libgnome-keyring-devel >= 0.6.0
@@ -55,7 +58,10 @@ MATE session.
 %patch4 -p1
 
 %build
-NOCONFIGURE=1 ./autogen.sh
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
 	--disable-silent-rules \
 	--disable-static \
diff --git a/use-gnome-keyring.patch b/use-gnome-keyring.patch
index 4850a10..1d0094e 100644
--- a/use-gnome-keyring.patch
+++ b/use-gnome-keyring.patch
@@ -49,8 +49,8 @@
      </key>
      <key name="spindown-enable-ac" type="b">
        <default>false</default>
---- mate-power-manager-1.5.2/src/gpm-control.c~	2013-03-19 19:02:51.000000000 +0200
-+++ mate-power-manager-1.5.2/src/gpm-control.c	2013-03-19 19:04:50.842255183 +0200
+--- mate-power-manager-1.6.1/src/gpm-control.c~	2013-05-06 14:40:50.000000000 +0300
++++ mate-power-manager-1.6.1/src/gpm-control.c	2013-05-06 14:40:52.904974917 +0300
 @@ -42,7 +33,7 @@
  #include <libupower-glib/upower.h>
  
@@ -60,7 +60,7 @@
  #endif /* WITH_KEYRING */
  
  #include "egg-debug.h"
-@@ -163,8 +154,8 @@
+@@ -163,8 +163,8 @@
  	GpmScreensaver *screensaver;
  	guint32 throttle_cookie = 0;
  #ifdef WITH_KEYRING
@@ -69,11 +69,11 @@
 +	gboolean lock_keyring;
 +	GnomeKeyringResult keyres;
  #endif /* WITH_KEYRING */
+ #ifdef WITH_SYSTEMD_SLEEP
+ 	GError *dbus_error = NULL;
+@@ -186,10 +186,10 @@
  
- 	screensaver = gpm_screensaver_new ();
-@@ -174,10 +174,10 @@
- 	}
- 
+ #ifdef WITH_KEYRING
  	/* we should perhaps lock keyrings when sleeping #375681 */
 -	lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
 -	if (lock_mate_keyring) {
@@ -85,7 +85,7 @@
 +		if (keyres != GNOME_KEYRING_RESULT_OK)
  			egg_warning ("could not lock keyring");
  	}
- 
+ #endif /* WITH_KEYRING */
 @@ -235,8 +226,8 @@
  	GpmScreensaver *screensaver;
  	guint32 throttle_cookie = 0;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-power-manager.git/commitdiff/224f5aa8fa461d4f747abff5c8801bb7c0ec2b8e