[packages/mate-power-manager] - up to 1.8.0 - support for gnome-keyring added upstream (use-gnome-keyring.patch removed)
atler
atler at pld-linux.org
Sun Mar 9 20:07:39 CET 2014
commit 37a92ccc9a119434ea26d33281e30de4a4f53b7d
Author: Jan Palus <jan.palus at gmail.com>
Date: Sun Mar 9 20:06:54 2014 +0100
- up to 1.8.0
- support for gnome-keyring added upstream (use-gnome-keyring.patch removed)
mate-power-manager.spec | 17 ++++----
use-gnome-keyring.patch | 114 ------------------------------------------------
2 files changed, 8 insertions(+), 123 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index dc2bbe9..391fe25 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -6,14 +6,13 @@
Summary: MATE power management service
Summary(pl.UTF-8): Usługa zarządzania energią dla MATE
Name: mate-power-manager
-Version: 1.6.3
+Version: 1.8.0
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: ec9e4784ca6a56d2d78d892d26bc5da6
-Patch1: use-gnome-keyring.patch
-Patch4: uidir.patch
+Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
+# Source0-md5: 09688f0422adce20de79f17d2f7a07b0
+Patch0: uidir.patch
URL: http://wiki.mate-desktop.org/mate-power-manager
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.9
@@ -29,13 +28,12 @@ BuildRequires: glib2-devel >= 1:2.26.0
%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0.0}
BuildRequires: intltool >= 0.35.0
BuildRequires: libcanberra-gtk-devel >= 0.10
-BuildRequires: libgnome-keyring-devel >= 0.6.0
+BuildRequires: libgnome-keyring-devel >= 3.0.0
BuildRequires: libnotify-devel >= 0.7.0
BuildRequires: libtool >= 2:2
%{!?with_gtk3:BuildRequires: libunique-devel >= 0.9.4}
%{?with_gtk3:BuildRequires: libunique3-devel >= 3.0}
BuildRequires: mate-common
-BuildRequires: mate-doc-utils
BuildRequires: mate-panel-devel >= 1.5.0
BuildRequires: pkgconfig
BuildRequires: popt-devel
@@ -46,6 +44,7 @@ BuildRequires: upower-devel >= 0.9.1
BuildRequires: xorg-lib-libXrandr-devel >= 1.3
BuildRequires: xorg-proto-xproto-devel >= 7.0.15
BuildRequires: xz
+BuildRequires: yelp-tools
Requires: cairo >= 1.0.0
Requires: dbus >= 1.0
Requires: dbus-glib >= 0.70
@@ -79,8 +78,7 @@ interaktywnej sesji MATE.
%prep
%setup -q
-%patch1 -p1
-%patch4 -p1
+%patch0 -p1
%build
%{__intltoolize}
@@ -107,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-power-manager.convert
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
%find_lang %{name} --with-mate --with-omf
diff --git a/use-gnome-keyring.patch b/use-gnome-keyring.patch
deleted file mode 100644
index 1d0094e..0000000
--- a/use-gnome-keyring.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- mate-power-manager-1.5.1/README 2012-11-23 04:26:11.000000000 +0200
-+++ mate-power-manager-1.5.1-gkr/README 2013-02-17 00:41:53.504808239 +0200
-@@ -15,7 +15,7 @@
-
- - Glib (2.13.0 or later)
- - Gtk2+ (2.11.0 or later)
-- - MATE Keyring (1.1.0 or later)
-+ - GNOME Keyring (0.6.0 or later)
- - DBus (0.70 or later)
- - libmatenotify (1.1.0 or later)
- - Cairo (1.0.0 or later)
---- mate-power-manager-1.5.2/configure.ac~ 2013-03-19 19:02:51.000000000 +0200
-+++ mate-power-manager-1.5.2/configure.ac 2013-03-19 19:03:42.805800085 +0200
-@@ -103,7 +103,7 @@
- GIO_REQUIRED=2.25.0
- GTK_REQUIRED=2.17.7
- GDK_REQUIRED=2.11.0
--MATE_KEYRING_REQUIRED=1.1.0
-+GNOME_KEYRING_REQUIRED=0.6.0
- DBUS_REQUIRED=1.0
- DBUS_GLIB_REQUIRED=0.70
- LIBMATENOTIFY_REQUIRED=1.1.0
-@@ -261,7 +261,7 @@
- AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
-
- if test "$with_keyring" = "yes"; then
-- PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED)
-+ PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
- AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
- fi
-
---- mate-power-manager-1.5.1/data/org.mate.power-manager.gschema.xml.in 2012-11-23 04:26:11.000000000 +0200
-+++ mate-power-manager-1.5.1-gkr/data/org.mate.power-manager.gschema.xml.in 2013-02-17 00:41:53.504808239 +0200
-@@ -183,13 +183,13 @@
- </key>
- <key name="lock-keyring-suspend" type="b">
- <default>false</default>
-- <_summary>Lock MATE keyring on sleep</_summary>
-- <_description>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
-+ <_summary>Lock GNOME keyring on sleep</_summary>
-+ <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
- </key>
- <key name="lock-keyring-hibernate" type="b">
- <default>true</default>
-- <_summary>Lock MATE keyring on sleep</_summary>
-- <_description>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
-+ <_summary>Lock GNOME keyring on sleep</_summary>
-+ <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
- </key>
- <key name="spindown-enable-ac" type="b">
- <default>false</default>
---- 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>
-
- #ifdef WITH_KEYRING
--#include <mate-keyring.h>
-+#include <gnome-keyring.h>
- #endif /* WITH_KEYRING */
-
- #include "egg-debug.h"
-@@ -163,8 +163,8 @@
- GpmScreensaver *screensaver;
- guint32 throttle_cookie = 0;
- #ifdef WITH_KEYRING
-- gboolean lock_mate_keyring;
-- MateKeyringResult keyres;
-+ gboolean lock_keyring;
-+ GnomeKeyringResult keyres;
- #endif /* WITH_KEYRING */
- #ifdef WITH_SYSTEMD_SLEEP
- GError *dbus_error = NULL;
-@@ -186,10 +186,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) {
-- keyres = mate_keyring_lock_all_sync ();
-- if (keyres != MATE_KEYRING_RESULT_OK)
-+ lock_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
-+ if (lock_keyring) {
-+ keyres = gnome_keyring_lock_all_sync ();
-+ 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;
- #ifdef WITH_KEYRING
-- gboolean lock_mate_keyring;
-- MateKeyringResult keyres;
-+ gboolean lock_keyring;
-+ GnomeKeyringResult keyres;
- #endif /* WITH_KEYRING */
-
- screensaver = gpm_screensaver_new ();
-@@ -242,10 +242,10 @@
- }
-
- /* we should perhaps lock keyrings when sleeping #375681 */
-- lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
-- if (lock_mate_keyring) {
-- keyres = mate_keyring_lock_all_sync ();
-- if (keyres != MATE_KEYRING_RESULT_OK) {
-+ lock_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
-+ if (lock_keyring) {
-+ keyres = gnome_keyring_lock_all_sync ();
-+ if (keyres != GNOME_KEYRING_RESULT_OK) {
- egg_warning ("could not lock keyring");
- }
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-power-manager.git/commitdiff/37a92ccc9a119434ea26d33281e30de4a4f53b7d
More information about the pld-cvs-commit
mailing list