[mate-power-manager] remove upstreamed patches
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Wed Jan 22 21:09:57 UTC 2014
commit 9a4e5e20d5a97d95304fb5b9cd1f47a0955c047a
Author: raveit65 <chat-to-me at raveit.de>
Date: Wed Jan 22 22:10:12 2014 +0100
remove upstreamed patches
mate-power-manager.spec | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index 1bd42f4..1994858 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -22,11 +22,7 @@ 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
+
# first work to support upower-1.0
#https://github.com/NiceandGently/mate-power-manager/commits/dev-upower
%if 0%{?fedora} > 20
@@ -36,9 +32,7 @@ Patch5: mate-power-manager_upower-use-g_signal-notify.patch
Patch6: mate-power-manager_upower-update-for-libupower-glib-API-changes.patch
Patch7: mate-power-manager_fix-use-g_signal-notify.patch
%endif
-# fix build issue
-# https://github.com/infirit/mate-power-manager/commit/b5d8ad0
-Patch8: mate-power-manager_set-DISABLE_DEPRECATED-to-an-empty-string.patch
+
BuildRequires: cairo-devel
BuildRequires: dbus-glib-devel
@@ -71,9 +65,6 @@ cp %{SOURCE1} autogen.sh
%patch0 -p1 -b .dbus
%patch1 -p1 -b .brightness
-%if 0%{?fedora} > 19
-%patch2 -p1 -b .gnome-keyring
-%endif
%if 0%{?fedora} > 20
%patch3 -p1 -b .upower
%patch4 -p1 -b .remove-recall
@@ -81,7 +72,6 @@ cp %{SOURCE1} autogen.sh
%patch6 -p1 -b .glib-API-changes
%patch7 -p1 -b .fix-use-g_signal-notify
%endif
-%patch8 -p1 -b .empty-string
# nedded to create missing configure and make files
NOCONFIGURE=1 ./autogen.sh
@@ -156,6 +146,8 @@ fi
- update BR's
- add --with-gnome --all-name for find language
- clean up file section
+- remove upstreamed switch-to-gnome-keyring patch for rawhide
+- remove upstreamed set-DISABLE_DEPRECATED-to-an-empty-string.patch
* Fri Dec 20 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.3-1
- updated to 1.6.3 release
More information about the scm-commits
mailing list