[mate-power-manager/f20] remove upstreamed upower-0.99 patches
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Fri Oct 3 13:12:37 UTC 2014
commit 7d55ba9f90d2c5f846db2cb407052600ba3192ee
Author: raveit65 <chat-to-me at raveit.de>
Date: Fri Oct 3 15:12:22 2014 +0200
remove upstreamed upower-0.99 patches
mate-power-manager.spec | 22 +-
mate-power-manager_avoid-levels-is-0-warning.patch | 15 -
mate-power-manager_improve-UPower1-support.patch | 102 -----
...ound-of-fixes-for-UPower-0.99-API-changes.patch | 217 -----------
mate-power-manager_port-to-upower-0.99-API.patch | 390 --------------------
...power-manager_remove-battery-recall-logic.patch | 263 -------------
6 files changed, 1 insertions(+), 1008 deletions(-)
---
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index 683f9a0..16d07ef 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -17,20 +17,6 @@ Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.x
# upstream patch
# https://github.com/mate-desktop/mate-power-manager/commit/8cb168b
Patch0: mate-power-manager_dbus_interface_keyboard_backlight_controls.patch
-# https://github.com/mate-desktop/mate-power-manager/commit/2b3cf01
-Patch1: mate-power-manager_avoid-levels-is-0-warning.patch
-
-# upstream fixes for upower-1.0, the order of the series is important
-%if 0%{?fedora} > 20
-# https://github.com/mate-desktop/mate-power-manager/commit/220a4e0
-Patch2: mate-power-manager_remove-battery-recall-logic.patch
-# https://github.com/mate-desktop/mate-power-manager/commit/d59f4b8
-Patch3: mate-power-manager_port-to-upower-0.99-API.patch
-# https://github.com/mate-desktop/mate-power-manager/commit/1fb2870
-Patch4: mate-power-manager_improve-UPower1-support.patch
-# https://github.com/mate-desktop/mate-power-manager/commit/8f734c6
-Patch5: mate-power-manager_other-round-of-fixes-for-UPower-0.99-API-changes.patch
-%endif
BuildRequires: cairo-devel
BuildRequires: dbus-glib-devel
@@ -61,13 +47,6 @@ displaying icons and handling user callbacks in an interactive MATE session.
#%%setup -q -n %{name}-%{_internal_version}
%patch0 -p1 -b .dbus
-%patch1 -p1 -b .avoid-levels-is-0-warning
-%if 0%{?fedora} > 20
-%patch2 -p1 -b .remove-battery-recall-logic
-%patch3 -p1 -b .port-to-upower-0.99-API
-%patch4 -p1 -b .improve-UPower1-support
-%patch5 -p1 -b .other-round-of-fixes-for-UPower-0.99
-%endif
# nedded to create configure and make files for dbus patch
NOCONFIGURE=1 ./autogen.sh
@@ -137,6 +116,7 @@ fi
%changelog
* Fri Oct 03 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
- update to 1.8.1 release
+- remove upstreamed upower-0.99 patches
* Sat Jul 26 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-3
- build 1.8 for f20
More information about the scm-commits
mailing list