[packages/upower] - updated to 0.99.0 - new soname - ABI/API break
kiesiu
kiesiu at pld-linux.org
Wed Mar 26 09:46:57 CET 2014
commit 8aebe76762fd3773c1690dfb2a2b51438344eaad
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date: Wed Mar 26 09:46:24 2014 +0100
- updated to 0.99.0
- new soname - ABI/API break
upower-battery_range.patch | 72 ----------------------------------------------
upower.spec | 26 +++++------------
2 files changed, 7 insertions(+), 91 deletions(-)
---
diff --git a/upower.spec b/upower.spec
index 5b7185d..9237c5a 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,13 +1,12 @@
Summary: Power management service
Summary(pl.UTF-8): Usługa zarządzania energią
Name: upower
-Version: 0.9.23
-Release: 2
+Version: 0.99.0
+Release: 1
License: GPL v2+
Group: Libraries
Source0: http://upower.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 39cfd97bfaf7d30908f20cf937a57634
-Patch0: %{name}-battery_range.patch
+# Source0-md5: 14f43bc13353e23e7280863f33ac50d2
URL: http://upower.freedesktop.org/
BuildRequires: autoconf >= 2.65
BuildRequires: automake >= 1:1.11
@@ -15,7 +14,7 @@ BuildRequires: dbus-devel >= 1.0.0
BuildRequires: dbus-glib-devel >= 0.76
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: glib2-devel >= 1:2.29.19
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk-doc >= 1.11
BuildRequires: intltool >= 0.40.0
@@ -54,7 +53,7 @@ Summary(pl.UTF-8): Biblioteka współdzielona UPower
Group: Libraries
Requires: dbus-glib >= 0.76
Requires: dbus-libs >= 1.0.0
-Requires: glib2 >= 1:2.22.0
+Requires: glib2 >= 1:2.29.19
Conflicts: upower < 0.9.18
%description libs
@@ -70,7 +69,7 @@ Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: dbus-devel >= 1.0.0
Requires: dbus-glib-devel >= 0.76
-Requires: glib2-devel >= 1:2.22.0
+Requires: glib2-devel >= 1:2.29.19
Obsoletes: DeviceKit-power-devel
Obsoletes: UPower-devel
@@ -108,7 +107,6 @@ Dokumentacja API UPower.
%prep
%setup -q
-%patch0 -p1
%build
%{__gtkdocize}
@@ -159,16 +157,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/UPower
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/UPower/UPower.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.UPower.service
-%{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.upower.qos.policy
%{systemdunitdir}/upower.service
-%attr(755,root,root) /lib/systemd/system-sleep/notify-upower.sh
-/lib/udev/rules.d/95-upower-battery-recall-dell.rules
-/lib/udev/rules.d/95-upower-battery-recall-fujitsu.rules
-/lib/udev/rules.d/95-upower-battery-recall-gateway.rules
-/lib/udev/rules.d/95-upower-battery-recall-ibm.rules
-/lib/udev/rules.d/95-upower-battery-recall-lenovo.rules
-/lib/udev/rules.d/95-upower-battery-recall-toshiba.rules
/lib/udev/rules.d/95-upower-csr.rules
/lib/udev/rules.d/95-upower-hid.rules
/lib/udev/rules.d/95-upower-wup.rules
@@ -180,7 +169,7 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libupower-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libupower-glib.so.1
+%attr(755,root,root) %ghost %{_libdir}/libupower-glib.so.2
%{_libdir}/girepository-1.0/UPowerGlib-1.0.typelib
%files devel
@@ -189,7 +178,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libupower-glib.la
%{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
%{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.xml
%{_datadir}/gir-1.0/UPowerGlib-1.0.gir
diff --git a/upower-battery_range.patch b/upower-battery_range.patch
deleted file mode 100644
index c8bb5e6..0000000
--- a/upower-battery_range.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 22da1a0bc5943b683189418d8b0f766e91b2bdbe Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt at gnome.org>
-Date: Tue, 22 Oct 2013 08:02:51 +0000
-Subject: linux: Clamp percentage for overfull batteries
-
-Some batteries report energy > energy_full and a percentage ("capacity"
-attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well
-as to avoid setting an out-of-range property which would then become 0%.
-
-https://launchpad.net/bugs/1240673
----
-diff --git a/src/linux/integration-test b/src/linux/integration-test
-index 6adc5c4..b7f11a9 100755
---- a/src/linux/integration-test
-+++ b/src/linux/integration-test
-@@ -458,6 +458,39 @@ class Tests(unittest.TestCase):
- self.assertEqual(self.get_dbus_display_property('WarningLevel'), UP_DEVICE_LEVEL_NONE)
- self.stop_daemon()
-
-+ def test_battery_overfull(self):
-+ '''battery which reports a > 100% percentage for a full battery'''
-+
-+ self.testbed.add_device('power_supply', 'BAT0', None,
-+ ['type', 'Battery',
-+ 'present', '1',
-+ 'status', 'Full',
-+ 'current_now', '1000',
-+ 'charge_now', '11000000',
-+ 'charge_full', '10000000',
-+ 'charge_full_design', '11000000',
-+ 'capacity', '110',
-+ 'voltage_now', '12000000'], [])
-+
-+ self.start_daemon()
-+ devs = self.proxy.EnumerateDevices()
-+ self.assertEqual(len(devs), 1)
-+ bat0_up = devs[0]
-+
-+ # should clamp percentage
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0)
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True)
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'),
-+ UP_DEVICE_STATE_FULLY_CHARGED)
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0)
-+ # should adjust EnergyFull to reality, not what the battery claims
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0)
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0)
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True)
-+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2)
-+ self.stop_daemon()
-+
- def test_battery_temperature(self):
- '''battery which reports temperature'''
-
-diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
-index fd509c3..977d1b0 100644
---- a/src/linux/up-device-supply.c
-+++ b/src/linux/up-device-supply.c
-@@ -677,6 +677,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
- /* get a precise percentage */
- if (sysfs_file_exists (native_path, "capacity")) {
- percentage = sysfs_get_double (native_path, "capacity");
-+ if (percentage < 0.0f)
-+ percentage = 0.0f;
-+ if (percentage > 100.0f)
-+ percentage = 100.0f;
- /* for devices which provide capacity, but not {energy,charge}_now */
- if (energy < 0.1f && energy_full > 0.0f)
- energy = energy_full * percentage / 100;
---
-cgit v0.9.0.2-2-gbebe
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/upower.git/commitdiff/8aebe76762fd3773c1690dfb2a2b51438344eaad
More information about the pld-cvs-commit
mailing list