[packages/mate-power-manager] - updated to 1.10.0 (1.8.x left on MATE-1.8 branch) - removed obsolete uidir,dbus_interface_keyboard
qboosh
qboosh at pld-linux.org
Sat May 16 10:14:45 CEST 2015
commit c8f83dc7132303214bf87374837a4f10eb4acae7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 16 10:16:26 2015 +0200
- updated to 1.10.0 (1.8.x left on MATE-1.8 branch)
- removed obsolete uidir,dbus_interface_keyboard_backlight_controls patches
mate-power-manager.spec | 35 +++--
...bus_interface_keyboard_backlight_controls.patch | 162 ---------------------
uidir.patch | 22 ---
3 files changed, 17 insertions(+), 202 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index 4e1f697..04f16b9 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -6,14 +6,12 @@
Summary: MATE power management service
Summary(pl.UTF-8): Usługa zarządzania energią dla MATE
Name: mate-power-manager
-Version: 1.8.1
-Release: 3
+Version: 1.10.0
+Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: c1c4e7e208f116a6daab8d0f92b82f6d
-Patch10: uidir.patch
-Patch0: %{name}_dbus_interface_keyboard_backlight_controls.patch
+Source0: http://pub.mate-desktop.org/releases/1.10/%{name}-%{version}.tar.xz
+# Source0-md5: 8f1c5d50681e701a434bb2bad55aefb9
URL: http://wiki.mate-desktop.org/mate-power-manager
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.9
@@ -24,8 +22,8 @@ BuildRequires: desktop-file-utils
BuildRequires: docbook-dtd41-sgml
BuildRequires: docbook-utils
BuildRequires: gettext-tools >= 0.10.40
-BuildRequires: glib2-devel >= 1:2.26.0
-%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.17.7}
+BuildRequires: glib2-devel >= 1:2.36.0
+%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.24.0}
%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0.0}
BuildRequires: intltool >= 0.35.0
%{!?with_gtk3:BuildRequires: libcanberra-gtk-devel >= 0.10}
@@ -36,13 +34,14 @@ BuildRequires: libtool >= 2:2
%{!?with_gtk3:BuildRequires: libunique-devel >= 0.9.4}
%{?with_gtk3:BuildRequires: libunique3-devel >= 3.0}
BuildRequires: mate-common
+BuildRequires: mate-desktop-devel >= 1.9.0
BuildRequires: mate-panel-devel >= 1.5.0
BuildRequires: pkgconfig
BuildRequires: popt-devel
BuildRequires: rpmbuild(find_lang) >= 1.36
%{?with_systemd:BuildRequires: systemd-devel >= 1:195}
BuildRequires: tar >= 1:1.22
-BuildRequires: upower-devel >= 0.9.1
+BuildRequires: upower-devel >= 0.9.5
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXrandr-devel >= 1.3
BuildRequires: xorg-lib-libXrender-devel
@@ -52,8 +51,8 @@ BuildRequires: yelp-tools
Requires: cairo >= 1.0.0
Requires: dbus >= 1.0
Requires: dbus-glib >= 0.70
-Requires: glib2 >= 1:2.26.0
-%{!?with_gtk3:Requires: gtk+2 >= 2:2.17.7}
+Requires: glib2 >= 1:2.36.0
+%{!?with_gtk3:Requires: gtk+2 >= 2:2.24.0}
%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
Requires: gtk-update-icon-cache
Requires: hicolor-icon-theme
@@ -62,8 +61,9 @@ Requires: libgnome-keyring >= 0.6.0
Requires: libnotify >= 0.7.0
%{!?with_gtk3:Requires: libunique >= 0.9.4}
%{?with_gtk3:Requires: libunique3 >= 3.0}
+Requires: mate-desktop-libs >= 1.9.0
Requires: mate-panel >= 1.5.0
-Requires: upower >= 0.9.1
+Requires: upower >= 0.9.5
Requires: xorg-lib-libXrandr >= 1.3
Suggests: udisks
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,8 +82,6 @@ interaktywnej sesji MATE.
%prep
%setup -q
-%patch10 -p1
-%patch0 -p1
%build
%{__intltoolize}
@@ -119,6 +117,9 @@ desktop-file-install \
--dir=$RPM_BUILD_ROOT%{_desktopdir} \
$RPM_BUILD_ROOT%{_desktopdir}/*.desktop
+# utility removed, drop man pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mate-power-manager-bugreport.1
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -135,21 +136,19 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog NEWS README
/etc/xdg/autostart/mate-power-manager.desktop
%attr(755,root,root) %{_bindir}/mate-power-manager
-%attr(755,root,root) %{_bindir}/mate-power-manager-bugreport
%attr(755,root,root) %{_bindir}/mate-power-preferences
%attr(755,root,root) %{_bindir}/mate-power-statistics
%attr(755,root,root) %{_sbindir}/mate-power-backlight-helper
%attr(755,root,root) %{_libexecdir}/mate-brightness-applet
%attr(755,root,root) %{_libexecdir}/mate-inhibit-applet
+%{_mandir}/man1/mate-power-backlight-helper.1*
%{_mandir}/man1/mate-power-manager.1*
%{_mandir}/man1/mate-power-preferences.1*
%{_mandir}/man1/mate-power-statistics.1*
%{_datadir}/%{name}
%{_datadir}/mate-panel/applets/org.mate.BrightnessApplet.mate-panel-applet
%{_datadir}/mate-panel/applets/org.mate.InhibitApplet.mate-panel-applet
-%{_datadir}/mate-panel/ui/brightness-applet-menu.xml
-%{_datadir}/mate-panel/ui/inhibit-applet-menu.xml
-%{_datadir}/dbus-1/services/mate-power-manager.service
+%{_datadir}/dbus-1/services/org.mate.PowerManager.service
%{_datadir}/dbus-1/services/org.mate.panel.applet.BrightnessAppletFactory.service
%{_datadir}/dbus-1/services/org.mate.panel.applet.InhibitAppletFactory.service
%{_datadir}/glib-2.0/schemas/org.mate.power-manager.gschema.xml
diff --git a/mate-power-manager_dbus_interface_keyboard_backlight_controls.patch b/mate-power-manager_dbus_interface_keyboard_backlight_controls.patch
deleted file mode 100644
index 416d752..0000000
--- a/mate-power-manager_dbus_interface_keyboard_backlight_controls.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-# upstream patch
-# https://github.com/mate-desktop/mate-power-manager/commit/8cb168b
-diff -uprN mate-power-manager-orig/src/gpm-common.h mate-power-manager/src/gpm-common.h
---- mate-power-manager-orig/src/gpm-common.h 2013-10-03 13:56:55.000000000 +0200
-+++ mate-power-manager/src/gpm-common.h 2013-10-13 19:54:10.649901214 +0200
-@@ -33,6 +33,7 @@ G_BEGIN_DECLS
- #define GPM_DBUS_SERVICE "org.mate.PowerManager"
- #define GPM_DBUS_INTERFACE "org.mate.PowerManager"
- #define GPM_DBUS_INTERFACE_BACKLIGHT "org.mate.PowerManager.Backlight"
-+#define GPM_DBUS_INTERFACE_KBD_BACKLIGHT "org.mate.PowerManager.KbdBacklight"
- #define GPM_DBUS_PATH "/org/mate/PowerManager"
- #define GPM_DBUS_PATH_BACKLIGHT "/org/mate/PowerManager/Backlight"
- #define GPM_DBUS_PATH_KBD_BACKLIGHT "/org/mate/PowerManager/KbdBacklight"
-diff -uprN mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager/src/gpm-kbd-backlight.c
---- mate-power-manager-orig/src/gpm-kbd-backlight.c 2013-10-03 13:56:55.000000000 +0200
-+++ mate-power-manager/src/gpm-kbd-backlight.c 2013-10-13 19:58:07.154258855 +0200
-@@ -31,21 +31,6 @@
- #include "gpm-kbd-backlight.h"
- #include "gsd-media-keys-window.h"
-
--static const gchar *kbd_backlight_introspection = ""
--"<?xml version=\"1.0\" encoding=\"UTF-8\"?>""<node name=\"/\">"
-- "<interface name=\"org.mate.PowerManager.Backlight\">"
-- "<method name=\"GetBrightness\">"
-- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
-- "</method>"
-- "<method name=\"SetBrightness\">"
-- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"in\"/>"
-- "</method>"
-- "<signal name=\"BrightnessChanged\">"
-- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
-- "</signal>"
-- "</interface>"
--"</node>";
--
- #define GPM_KBD_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_KBD_BACKLIGHT, GpmKbdBacklightPrivate))
-
- struct GpmKbdBacklightPrivate
-@@ -430,40 +415,6 @@ gpm_kbd_backlight_dbus_property_set (GDB
- return FALSE;
- }
-
--/**
-- * gpm_kbd_backlight_register_dbus:
-- * @backlight:
-- * @connection:
-- * @error:
-- **/
--void
--gpm_kbd_backlight_register_dbus (GpmKbdBacklight *backlight,
-- GDBusConnection *connection,
-- GError **error)
--{
-- GDBusNodeInfo *node_info;
-- GDBusInterfaceInfo *interface_info;
-- GDBusInterfaceVTable interface_vtable = {
-- gpm_kbd_backlight_dbus_method_call,
-- gpm_kbd_backlight_dbus_property_get,
-- gpm_kbd_backlight_dbus_property_set
-- };
--
-- node_info = g_dbus_node_info_new_for_xml (kbd_backlight_introspection, NULL);
-- interface_info = g_dbus_node_info_lookup_interface (node_info, GPM_DBUS_INTERFACE_BACKLIGHT);
--
-- backlight->priv->bus_connection = g_object_ref (connection);
-- backlight->priv->bus_object_id =
-- g_dbus_connection_register_object (connection,
-- GPM_DBUS_PATH_KBD_BACKLIGHT,
-- interface_info,
-- &interface_vtable,
-- backlight,
-- NULL,
-- error);
-- g_dbus_node_info_unref (node_info);
--}
--
- static gboolean
- gpm_kbd_backlight_evaluate_power_source_and_set (GpmKbdBacklight *backlight)
- {
-diff -uprN mate-power-manager-orig/src/gpm-manager.c mate-power-manager/src/gpm-manager.c
---- mate-power-manager-orig/src/gpm-manager.c 2013-10-03 13:56:55.000000000 +0200
-+++ mate-power-manager/src/gpm-manager.c 2013-10-13 20:05:11.449488592 +0200
-@@ -63,6 +63,7 @@
- #include "gpm-disks.h"
-
- #include "org.mate.PowerManager.Backlight.h"
-+#include "org.mate.PowerManager.KbdBacklight.h"
-
- static void gpm_manager_finalize (GObject *object);
-
-@@ -1986,12 +1987,13 @@ gpm_manager_init (GpmManager *manager)
- G_OBJECT (manager->priv->backlight));
- }
-
-- manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
-- if (manager->priv->kbd_backlight != NULL) {
-- gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight,
-- g_connection,
-- NULL);
-- }
-+ manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
-+ if (manager->priv->kbd_backlight != NULL) {
-+ dbus_g_object_type_install_info (GPM_TYPE_KBD_BACKLIGHT,
-+ &dbus_glib_gpm_kbd_backlight_object_info);
-+ dbus_g_connection_register_g_object (connection, GPM_DBUS_PATH_KBD_BACKLIGHT,
-+ G_OBJECT (manager->priv->kbd_backlight));
-+ }
-
- manager->priv->idle = gpm_idle_new ();
- g_signal_connect (manager->priv->idle, "idle-changed",
-diff -uprN mate-power-manager-orig/src/Makefile.am mate-power-manager/src/Makefile.am
---- mate-power-manager-orig/src/Makefile.am 2013-10-03 13:56:55.000000000 +0200
-+++ mate-power-manager/src/Makefile.am 2013-10-13 20:10:17.374533688 +0200
-@@ -6,6 +6,7 @@ NULL =
- EXTRA_DIST = \
- org.mate.PowerManager.xml \
- org.mate.PowerManager.Backlight.xml \
-+ org.mate.PowerManager.KbdBacklight.xml \
- gpm-marshal.list \
- $(NULL)
-
-@@ -270,6 +271,7 @@ endif
- BUILT_SOURCES = \
- org.mate.PowerManager.h \
- org.mate.PowerManager.Backlight.h \
-+ org.mate.PowerManager.KbdBacklight.h \
- gpm-marshal.c \
- gpm-marshal.h \
- $(NULL)
-@@ -295,6 +297,13 @@ org.mate.PowerManager.Backlight.h: org.m
- --output=org.mate.PowerManager.Backlight.h \
- $(srcdir)/org.mate.PowerManager.Backlight.xml
-
-+org.mate.PowerManager.KbdBacklight.h: org.mate.PowerManager.KbdBacklight.xml
-+ libtool --mode=execute dbus-binding-tool \
-+ --prefix=gpm_kbd_backlight \
-+ --mode=glib-server \
-+ --output=org.mate.PowerManager.KbdBacklight.h \
-+ $(srcdir)/org.mate.PowerManager.KbdBacklight.xml
-+
- clean-local:
- rm -f *~
- rm -f gpm-marshal.c gpm-marshal.h
-diff -uprN mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml
---- mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:12:11.556667787 +0200
-+++ mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:11:45.972413654 +0200
-@@ -0,0 +1,15 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<node name="/">
-+ <interface name="org.mate.PowerManager.KbdBacklight">
-+ <method name="GetBrightness">
-+ <arg type="u" name="percentage_brightness" direction="out"/>
-+ </method>
-+ <method name="SetBrightness">
-+ <arg type="u" name="percentage_brightness" direction="in"/>
-+ </method>
-+ <signal name="BrightnessChanged">
-+ <arg type="u" name="percentage_brightness" direction="out"/>
-+ </signal>
-+ </interface>
-+</node>
-+
diff --git a/uidir.patch b/uidir.patch
deleted file mode 100644
index 72711a8..0000000
--- a/uidir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mate-power-manager-1.5.1/applets/brightness/Makefile.am~ 2013-03-02 19:33:45.000000000 +0200
-+++ mate-power-manager-1.5.1/applets/brightness/Makefile.am 2013-03-02 19:35:13.858468368 +0200
-@@ -60,7 +60,7 @@
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
-
--uidir = $(datadir)/mate-2.0/ui
-+uidir = $(datadir)/mate-panel/ui
- ui_DATA = brightness-applet-menu.xml
-
- EXTRA_DIST = org.mate.BrightnessApplet.mate-panel-applet.in.in $(ui_DATA) $(service_in_files)
---- mate-power-manager-1.5.1/applets/inhibit/Makefile.am~ 2013-03-02 19:33:45.000000000 +0200
-+++ mate-power-manager-1.5.1/applets/inhibit/Makefile.am 2013-03-02 19:37:05.210279694 +0200
-@@ -59,7 +59,7 @@
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
-
--uidir = $(datadir)/mate-2.0/ui
-+uidir = $(datadir)/mate-panel/ui
- ui_DATA = inhibit-applet-menu.xml
-
- EXTRA_DIST = org.mate.InhibitApplet.mate-panel-applet.in.in $(ui_DATA) $(service_in_files)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-power-manager.git/commitdiff/c8f83dc7132303214bf87374837a4f10eb4acae7
More information about the pld-cvs-commit
mailing list