Compare commits

...
Sign in to create a new pull request.

45 commits

Author SHA1 Message Date
Kate Hsuan
b15ffc9b97 Update to the upstream version 1.91.0
Update to 1.91.0

Resolves: #2416975
2025-11-26 16:51:27 +08:00
Kate Hsuan
4fc4010f6d Update to the upstream version 1.90.10 (rhbz#2391004)
Update to version 1.90.10.
2025-08-29 15:51:16 +08:00
Kate Hsuan
a7310904eb Fix URL (rhbz#2387606)
Fix URL.
2025-08-29 14:58:04 +08:00
Kate Hsuan
4c15a189e8 Upower owns /usr/share/installed-tests/upower
Upower owns its test directory.

Resolves: rhbz#2281974
2025-08-28 15:41:56 +08:00
Kate Hsuan
f8b971fcb6 Migrate to tmt test
Resolves: #2383092
2025-08-05 15:12:59 +08:00
Fedora Release Engineering
8b4f2fc330 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:49:53 +00:00
Kate Hsuan
40391129a5 Move the test files to the upower-tests package
Move test file to the tests packages.

Resolves: #2351829
2025-05-21 15:47:57 +08:00
Kate Hsuan
59781ca958 Revert "Move the test files to the upower-tests package"
This reverts commit 27fd9bd9e8.
2025-05-21 15:45:48 +08:00
Kate Hsuan
27fd9bd9e8 Move the test files to the upower-tests package 2025-05-21 15:19:22 +08:00
Kate Hsuan
791fa9ff47 Update to the upstream version 1.90.9 2025-04-11 12:07:39 +08:00
Kate Hsuan
b501ba1ff3 Update to the upstream version 1.90.8 2025-03-31 15:53:24 +08:00
Fedora Release Engineering
9a0a60360f Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:51:00 +00:00
Kate Hsuan
df248073c0 Update to the upstream release 1.90.7 2025-01-15 11:24:23 +08:00
Kate Hsuan
cd7a0b6a5b Fix device update issue
The following fix patch was included.
"linux: up-enumerator-udev: Find the correct parent id for input devices"
Link: 7d7bb84fde.patch
2024-10-04 15:34:58 +08:00
Neal Gompa
50380ac0ae Rebuild for libimobiledevice update 2024-10-03 17:36:04 -04:00
Kate Hsuan
692fec60cb Update to upstream release 1.90.6 2024-09-24 14:10:37 +08:00
Kate Hsuan
a056d9bafc Add polkit dependency and fix intergration test filename 2024-09-14 16:42:46 +08:00
Kate Hsuan
4ef5b48c65 Updated to upstream release 1.90.5
- Support battery charging limit
2024-09-14 16:00:49 +08:00
Fedora Release Engineering
f4fe8b9201 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:20:35 +00:00
Kate Hsuan
a5f363789c Fix test dependency
pygobject-devel is renamed to python3-gobject-base.
2024-06-11 16:38:10 +08:00
Leigh Scott
e0e40e7b02 Update to 1.90.4 2024-04-10 16:13:17 +01:00
Fedora Release Engineering
31479f0c50 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:11:23 +00:00
Michel Alexandre Salim
ef8cbd3e58
Rebuilt for libimobiledevice and libplist soname bump
Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
2023-07-28 17:32:17 -05:00
Fedora Release Engineering
e42dc557e6 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:11:38 +00:00
Bastien Nocera
9a30f3c81b Update to 1.90.2 2023-07-06 11:08:11 +02:00
Bastien Nocera
dc5bf473a0 Update to 1.90.1 2023-07-04 16:33:32 +02:00
Richard Hughes
64880686f7 migrated to SPDX license 2023-02-22 09:38:07 +00:00
Yaakov Selkowitz
4e2e15c749 Separate libs package
This is needed for flatpak builds of upower-dependent clients, which
will communicate with the system upower service over D-Bus, to avoid
pulling in systemd.
2023-02-19 07:23:24 -05:00
Fedora Release Engineering
fb62487adc Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:53:33 +00:00
Fedora Release Engineering
3234e68720 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:28:19 +00:00
Benjamin Berg
87e4ae4077 Update to 0.99.20
Resolves: #2106841
2022-07-15 11:42:59 +02:00
Benjamin Berg
32c353f8f5 Update to 0.99.19
Resolves: #2050327
Resolves: #2093607
2022-06-09 18:42:23 +02:00
Benjamin Berg
714d272ce9 Remove sqlite build dependency 2022-06-09 18:42:23 +02:00
Benjamin Berg
487bba4db1 Remove unused commit global 2022-06-09 18:42:23 +02:00
Benjamin Berg
d8423dc2fa Remove ancient Obsoletes: line 2022-06-09 18:42:23 +02:00
Benjamin Berg
22139bfa24 Build linux backend on s390
This was disabled due to the lack of libusb1 in 2010. However, that is
not a dependency anymore, and while imobiledevice is missing the
configuration will be picked up automatically.
2022-06-09 18:42:23 +02:00
Benjamin Berg
0d63374acd Convert to rpmautospec 2022-06-09 16:02:08 +02:00
Bastien Nocera
996c754c31 + upower-0.99.14-1
Update to 0.99.14
2022-02-07 11:33:00 +01:00
Fedora Release Engineering
7195162ccb - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:35:30 +00:00
Benjamin Berg
6ab0fb1013 Add git-core to tests dependency
This is required to unpack the sources.
2021-08-23 16:28:02 +02:00
Benjamin Berg
ab89b54d2b Add python3-packaging dependency to tests
This is needed for an added version check that was added.

Related: #1994639
2021-08-23 15:04:38 +02:00
Bastien Nocera
6a516b6bb6 + upower-0.99.13-1
Update to 0.99.13
2021-08-17 17:32:20 +02:00
Fedora Release Engineering
aa1546dd8f - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 20:06:31 +00:00
Bastien Nocera
a457c6e92b + upower-0.99.12-1
Update to 0.99.12
2021-06-17 15:59:26 +02:00
Zbigniew Jędrzejewski-Szmek
809c5439d2 Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:12:05 +01:00
12 changed files with 381 additions and 1010 deletions

1
.fmf/version Normal file
View file

@ -0,0 +1 @@
1

15
.gitignore vendored
View file

@ -33,3 +33,18 @@ upower-0.9.5.tar.bz2
/upower-0.99.9.tar.xz
/upower-0.99.10.tar.xz
/upower-0.99.11.tar.xz
/upower-0.99.12.tar.xz
/upower-0.99.13.tar.xz
/upower-v0.99.14.tar.bz2
/upower-v0.99.19.tar.bz2
/upower-v0.99.20.tar.bz2
/upower-v1.90.1.tar.bz2
/upower-v1.90.2.tar.bz2
/upower-v1.90.4.tar.bz2
/upower-v1.90.5.tar.bz2
/upower-v1.90.6.tar.bz2
/upower-v1.90.7.tar.bz2
/upower-v1.90.8.tar.bz2
/upower-v1.90.9.tar.bz2
/upower-v1.90.10.tar.bz2
/upower-v1.91.0.tar.bz2

View file

@ -1,28 +0,0 @@
From 694207d3f08bdd2095f01eee09eb523363800825 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 16 Jun 2020 14:04:25 +0200
Subject: [PATCH] build: Use a newer libplist if available
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a96b794..5f08d91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,8 +202,10 @@ if test x$with_backend = xlinux; then
PKG_CHECK_MODULES(USB, [libusb-1.0 >= 1.0.0])
AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without libimobiledevice]),
with_idevice=$withval,with_idevice=yes)
+ LIBPLIST_DEP=libplist
+ PKG_CHECK_EXISTS(libplist-2.0, LIBPLIST_DEP=libplist-2.0)
AS_IF([test "x$with_idevice" != "xno"],
- [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 libplist >= 0.12, have_idevice=yes, have_idevice=no)],
+ [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 $LIBPLIST_DEP, have_idevice=yes, have_idevice=no)],
[have_idevice=no])
AS_IF([test "x$have_idevice" = "xyes"],
[AC_DEFINE(HAVE_IDEVICE, 1, [Define to 1 if iDevice is going to be built])])
--
2.26.2

View file

@ -1,76 +0,0 @@
From 97185bae75b16bea48d532aa5511417e485b1c06 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 17 Jun 2020 10:51:09 +0200
Subject: [PATCH] linux: Add support for iPhone XR, XS models
Modifying the udev serial to be acceptable as an hyphened UDID, as the
usbmux stack expects.
Closes: #114
---
src/linux/up-device-idevice.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/linux/up-device-idevice.c b/src/linux/up-device-idevice.c
index a808269..d2fa0a1 100644
--- a/src/linux/up-device-idevice.c
+++ b/src/linux/up-device-idevice.c
@@ -203,6 +203,28 @@ out:
return G_SOURCE_CONTINUE;
}
+static char *
+get_device_uuid (GUdevDevice *native)
+{
+ const char *uuid;
+ char *retval;
+
+ uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
+ if (uuid == NULL)
+ return NULL;
+
+ if (strlen (uuid) != 24)
+ return g_strdup (uuid);
+
+ /* new style UDID: add hyphen between first 8 and following 16 digits */
+ retval = g_malloc0 (24 + 1 + 1);
+ memcpy (&retval[0], &uuid[0], 8);
+ retval[8] = '-';
+ memcpy (&retval[9], &uuid[8], 16);
+
+ return retval;
+}
+
/**
* up_device_idevice_coldplug:
*
@@ -213,7 +235,7 @@ up_device_idevice_coldplug (UpDevice *device)
{
UpDeviceIdevice *idevice = UP_DEVICE_IDEVICE (device);
GUdevDevice *native;
- const gchar *uuid;
+ char *uuid;
const gchar *model;
UpDeviceKind kind;
@@ -223,7 +245,7 @@ up_device_idevice_coldplug (UpDevice *device)
return FALSE;
/* Get the UUID */
- uuid = g_udev_device_get_property (native, "ID_SERIAL_SHORT");
+ uuid = get_device_uuid (native);
if (uuid == NULL)
return FALSE;
@@ -253,6 +275,8 @@ up_device_idevice_coldplug (UpDevice *device)
g_source_set_name_by_id (idevice->priv->start_id,
"[upower] up_device_idevice_start_poll_cb (linux)");
+ g_free (uuid);
+
return TRUE;
}
--
2.26.2

284
changelog Normal file
View file

@ -0,0 +1,284 @@
* Mon Feb 07 2022 Bastien Nocera <bnocera@redhat.com> - 0.99.14-1
+ upower-0.99.14-1
- Update to 0.99.14
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Aug 17 2021 Bastien Nocera <bnocera@redhat.com> - 0.99.13-1
+ upower-0.99.13-1
- Update to 0.99.13
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jun 17 2021 Bastien Nocera <bnocera@redhat.com> - 0.99.12-1
+ upower-0.99.12-1
- Update to 0.99.12
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.99.11-10
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.11-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 19 2021 Bastien Nocera <bnocera@redhat.com> - 0.99.11-8
+ upower-0.99.11-8
- Remove USB dependency
* Tue Nov 24 2020 Bastien Nocera <bnocera@redhat.com> - 0.99.11-7
+ upower-0.99.11-7
- Disable libimobiledevice integration on RHEL
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 17 2020 Bastien Nocera <bnocera@redhat.com> - 0.99.11-5
+ upower-0.99.11-5
- Use upstreamed libplist patch
- Add support for iPhone XS,XR
* Tue Jun 16 2020 Adam Williamson <awilliam@redhat.com> - 0.99.11-4
- Fix imobiledevice support with new libplist, rebuild for soname bumps
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Sep 4 2019 Christian Kellner <ckellner@redhat.com> - 0.99.11-2
- Add systemd service snippets
- Use macros for _unitdir and _udevrulesdir
- Mark _datadir/gtk-doc as directory
* Tue Sep 3 2019 Christian Kellner <ckellner@redhat.com> - 0.99.11-1
- New upstream release 0.99.11
- Intltool has been replaced by gettext
- D-Bus configuration moved from sysconfdir to datadir
- Systemd is creating /var/lib/upower, so 'ghost' the dir
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Feb 20 2019 Christian Kellner <ckellner@redhat.com> - 0.99.10-1
- New upstream release with the following changes:
- Set 'pending-charge' for DisplayDevice if at least one battery is in
the 'pending-charge' state
- Map pending-charge to fully-charged when charge is 100%
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 20 2018 Christian Kellner <ckellner@redhat.com> - 0.99.9-1
- New upstream release
- Drop unneccessary patch to fix udev events access
- Fix daemon lockdown issues (keyboard backlight, AC status changes)
- Out-of-tree build fixes and documentation fixes
* Sun Oct 07 2018 Kalev Lember <klember@redhat.com> - 0.99.8-3
- Backport an upstream fix for upower not having access to udev events
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Bastien Nocera <bnocera@redhat.com> - 0.99.8-1
+ upower-0.99.8-1
- Update to 0.99.8
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.99.7-2
- Switch to %%ldconfig_scriptlets
* Tue Nov 28 2017 Bastien Nocera <bnocera@redhat.com> - 0.99.7-1
+ upower-0.99.7-1
- Update to 0.99.7
- Add Bluetooth LE battery support
- Fix critical action after resume from hibernate
* Mon Sep 11 2017 Richard Hughes <rhughes@redhat.com> - 0.99.6-1
- New upstream release
- Detect joysticks as gaming input devices
- Fix crash when '@' is present in the device name
- Grab the model name from device if unavailable from battery
* Thu Aug 24 2017 Benjamin Berg <bberg@redhat.com> - 0.99.5-4
- Add patch to not correctly close the inhibitor FD
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Jul 24 2017 Richard Hughes <rhughes@redhat.com> - 0.99.5-1
- New upstream release
- Add BatteryLevel property for devices with a finite number of power levels
- Add support for pausing and resuming of the daemon poll
- Do not spin in a loop when /proc/timer_stats cannot be written
- Fix reading and writing the keyboard brightness level
- Get a serial number for device batteries
- Refresh devices after waking up from sleep
- Lower initial power usage when iDevice isn't accessible
* Tue Feb 14 2017 Dan Horák <dan[at]danny.cz> - 0.99.4-4
- Add explicit BR:systemd to fix s390(x) build
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Mar 14 2016 Bastien Nocera <bnocera@redhat.com> 0.99.4-2
- Fix getting the critical action
* Tue Feb 16 2016 Richard Hughes <rhughes@redhat.com> - 0.99.4-1
- New upstream release
- Add support for Logitech G700s/G700 Gaming Mouse
- Change the default low battery policy to percentage
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu May 28 2015 Richard Hughes <rhughes@redhat.com> - 0.99.3-1
- New upstream release
- Fix several crashes
- Properly detect bluetooth mice and keyboards that are HID devices
- Support Logitech Unifying in Linux 3.19
- Work-around broken battery on the Onda v975w
* Wed Mar 18 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.99.2-4
- pull in upstream crash fix (#1128390)
- use %%autosetup
- -devel: tighten subpkg dep via %%_isa
- -devel-docs: fix Summary
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.99.2-3
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
* Wed Feb 11 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.99.2-2
- Rebuild (libimobiledevice)
- Use %%license
* Thu Dec 18 2014 Richard Hughes <rhughes@redhat.com> - 0.99.2-1
- New upstream release
- Fix various memory and reference leaks
- Respect the CriticalPowerAction config option
- Set update-time on the aggregate device
- Update display device when battery is removed
* Sun Nov 16 2014 Kalev Lember <kalevlember@gmail.com> - 0.99.1-3
- Obsolete compat-upower09 from rhughes-f20-gnome-3-12 copr
* Wed Oct 15 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.99.1-2
- Rebuild for libimobiledevice 1.1.7
* Mon Aug 18 2014 Richard Hughes <rhughes@redhat.com> - 0.99.1-1
- New upstream release
- Create the history directory at runtime
- Do not log a critical warning when using _set_object_path_sync()
- Fix API doc for up_client_get_on_battery()
- Fix possible UpHistoryItem leak on failure
- Fix segfault on getting property when daemon is not running
- Fix shutdown on boot on some machines
- Fix small memleak on startup with Logitech devices
- Free the obtained device list array after use
- Remove IsDocked property
- Remove unused polkit dependency
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 0.99.0-6
- Rebuilt for gobject-introspection 1.41.4
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon May 5 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.99.0-4
- Rebuild for libimobiledevice 1.1.6
* Mon Mar 17 2014 Richard Hughes <rhughes@redhat.com> - 0.99.0-3
- Split out a new devel-docs subpackage to fix multilib_policy=all installs.
- Resolves: #1070661
* Fri Nov 08 2013 Bastien Nocera <bnocera@redhat.com> 0.99.0-2
- Fix crash when D-Bus isn't available
* Tue Oct 29 2013 Richard Hughes <rhughes@redhat.com> - 0.99.0-1
- New upstream release
- This version contains major API changes and bumps library soname.
- Add DisplayDevice composite battery
- Add WarningLevel and IconName properties to all devices
- Clamp percentage for overfull batteries
- Emit PropertiesChanged signals
- Enforce critical battery policy on the daemon side
- Reduce client-side and daemon-side wake-ups
- Register objects on the bus once they've been setup
- Remove DeviceChanged and Changed signals
- Remove OnLowBattery property (use WarningLevel instead)
- Remove QoS support
- Remove battery recall support
* Fri Oct 18 2013 Richard Hughes <rhughes@redhat.com> - 0.9.23-1
- New upstream release
- Add missing dbus-glib-1 to private requires
- Avoid trying to close fd that wasn't opened
- Disable Watts-Up devices by default
- Don't guess discharging state for devices
- Fix crasher calling _about_to_sleep_sync()
- Really don't overwrite retval with prop values
- Update and correct Toshiba recall list
* Wed Oct 09 2013 Bastien Nocera <bnocera@redhat.com> 0.9.22-1
- Update to 0.9.22
- Fixes incorrect reporting of some properties
- Fixes battery values for Logitech unifying devices
- Bluetooth input devices support
- Device name fixes
* Fri Jul 26 2013 Richard Hughes <rhughes@redhat.com> - 0.9.21-1
- New upstream release
- Add support for Logitech Wireless (NonUnifying) devices
- Allow clients to call org.freedesktop.DBus.Peer
- Update the upower man page with all the current options
- Use PIE to better secure installed tools and also use full RELRO in the daemon
* Thu Apr 25 2013 Matthias Clasen <mclasen@redhat.com> - 0.9.20-3
- Enabled hardened build
- Don't use /lib/udev in file paths
* Tue Mar 19 2013 Matthias Clasen <mclasen@redhat.com> - 0.9.20-2
- Rebuild
* Mon Mar 11 2013 Richard Hughes <rhughes@redhat.com> - 0.9.20-1
- New upstream release
- Add a --enable-deprecated configure argument to remove pm-utils support
- Deprecate running the powersave scripts
- Factor out the Logitech Unifying support to support other devices
- Require unfixed applications to define UPOWER_ENABLE_DEPRECATED
- Fix batteries which report current energy but full charge
- Fix several small memory leaks
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jan 02 2013 Richard Hughes <rhughes@redhat.com> - 0.9.19-1
- New upstream release
- Add a Documentation tag to the service file
- Add support for Logitech Unifying devices
- Do not continue to poll if /proc/timer_stats is not readable
- Fix device matching for recent kernels
- Resolves: #848521
* Wed Oct 24 2012 Dan Horák <dan[at]danny.cz> - 0.9.18-2
- the notify-upower script is not installed with dummy backend on s390(x)
* Wed Aug 08 2012 Richard Hughes <rhughes@redhat.com> - 0.9.18-1
- New upstream release
- Use systemd for suspend and hibernate
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

19
plans/integration.fmf Normal file
View file

@ -0,0 +1,19 @@
summary: Test for Upower
discover:
how: fmf
prepare:
- name: packages
how: install
package:
- upower
- upower-tests
- umockdev-devel
- dbus-x11
- polkit-devel
- python3-dbus
- python3-dbusmock
- python3-gobject-base
- python3-pip
- python3-packaging
execute:
how: tmt

View file

@ -1 +1 @@
SHA512 (upower-0.99.11.tar.xz) = 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
SHA512 (upower-v1.91.0.tar.bz2) = 32801d3ee4c5086221a9f12062b0f2e6765b239f68a562c24ef7808999bb34e299e6acd31acf5c414cf41613709c97b20ad64d252e1d8ddf23183576b156cf93

View file

@ -0,0 +1,2 @@
summary: Upower integration test
test: bash ./run-it.sh

View file

@ -2,7 +2,7 @@
set -u
# main script
IT="${1:-source/src/linux/integration-test}"
IT="${1:-/usr/libexec/installed-tests/upower/integration-test.py}"
# check if we need to install additional packages
# which is the case if we are on RHEL 8

View file

@ -1,23 +0,0 @@
---
- hosts: localhost
roles:
- role: standard-test-source
tags:
- always
- role: standard-test-basic
tags:
- atomic
- classic
required_packages:
- upower
- pygobject3-devel
- python3-dbus
- python3-dbusmock
- umockdev-devel
tests:
- smoke:
dir: smoke
run: upower -d
- integration:
dir: .
run: ./run-it.sh source/src/linux/integration-test

View file

@ -1,574 +0,0 @@
From 4227d0c439aa8f812c702f7f169be545d3a139e1 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 19 Jan 2021 13:28:48 +0100
Subject: [PATCH 1/2] linux: Remove support for CSR devices
Those devices date back from the mid-2000s. If they still work, and
somebody is still interested in having them export their battery status,
we would recommend moving this information to the appropriate kernel
drivers.
---
rules/95-upower-csr.rules | 21 ---
rules/Makefile.am | 1 -
src/linux/Makefile.am | 2 -
src/linux/up-backend.c | 8 -
src/linux/up-device-csr.c | 344 --------------------------------------
src/linux/up-device-csr.h | 56 -------
6 files changed, 432 deletions(-)
delete mode 100644 rules/95-upower-csr.rules
delete mode 100644 src/linux/up-device-csr.c
delete mode 100644 src/linux/up-device-csr.h
diff --git a/rules/95-upower-csr.rules b/rules/95-upower-csr.rules
deleted file mode 100644
index 7c5f560..0000000
--- a/rules/95-upower-csr.rules
+++ /dev/null
@@ -1,21 +0,0 @@
-##############################################################################################################
-# Logitech Mice with CSR battery readouts
-#
-# These are properties defining the behavior:
-# UPOWER_CSR_DUAL (Dual Receiver)
-#
-SUBSYSTEM!="usb", GOTO="up_csr_end"
-
-ATTR{idVendor}=="046d", ENV{UPOWER_VENDOR}="Logitech, Inc."
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c501", ENV{UPOWER_PRODUCT}="Mouse Receiver", ENV{UPOWER_BATTERY_TYPE}="mouse"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c502", ENV{UPOWER_PRODUCT}="Dual Receiver", ENV{UPOWER_BATTERY_TYPE}="mouse", ENV{UPOWER_CSR_DUAL}="1"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c504", ENV{UPOWER_PRODUCT}="Freedom Optical", ENV{UPOWER_BATTERY_TYPE}="mouse", ENV{UPOWER_CSR_DUAL}="1"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c505", ENV{UPOWER_PRODUCT}="Elite Duo", ENV{UPOWER_BATTERY_TYPE}="keyboard"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c506", ENV{UPOWER_PRODUCT}="MX700 Optical Mouse", ENV{UPOWER_BATTERY_TYPE}="mouse"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c508", ENV{UPOWER_PRODUCT}="Optical TrackMan", ENV{UPOWER_BATTERY_TYPE}="mouse"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c50e", ENV{UPOWER_PRODUCT}="MX1000 Laser Mouse", ENV{UPOWER_BATTERY_TYPE}="mouse"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c510", ENV{UPOWER_PRODUCT}="Click! Mouse", ENV{UPOWER_BATTERY_TYPE}="mouse"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c512", ENV{UPOWER_PRODUCT}="Keyboard+Mouse Receiver", ENV{UPOWER_BATTERY_TYPE}="keyboard"
-ATTR{idVendor}=="046d", ATTR{idProduct}=="c702", ENV{UPOWER_PRODUCT}="Presenter", ENV{UPOWER_BATTERY_TYPE}="mouse"
-
-LABEL="up_csr_end"
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 5262d9e..1d71d24 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -3,7 +3,6 @@
udevrules_DATA = \
95-upower-wup.rules \
95-upower-hid.rules \
- 95-upower-csr.rules \
95-upower-hidpp.rules
EXTRA_DIST = \
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index aec0b31..82f60fd 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -29,8 +29,6 @@ endif
libupshared_la_SOURCES = \
up-device-supply.c \
up-device-supply.h \
- up-device-csr.c \
- up-device-csr.h \
up-device-unifying.c \
up-device-unifying.h \
up-device-hid.c \
diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
index 04e6f2f..e17a946 100644
--- a/src/linux/up-backend.c
+++ b/src/linux/up-backend.c
@@ -38,7 +38,6 @@
#include "sysfs-utils.h"
#include "up-device-supply.h"
-#include "up-device-csr.h"
#include "up-device-unifying.h"
#include "up-device-wup.h"
#include "up-device-hid.h"
@@ -147,13 +146,6 @@ up_backend_device_new (UpBackend *backend, GUdevDevice *native)
g_object_unref (device);
#endif /* HAVE_IDEVICE */
- /* see if this is a CSR mouse or keyboard */
- device = UP_DEVICE (up_device_csr_new ());
- ret = up_device_coldplug (device, backend->priv->daemon, G_OBJECT (native));
- if (ret)
- goto out;
- g_object_unref (device);
-
/* try to detect a HID UPS */
device = UP_DEVICE (up_device_hid_new ());
ret = up_device_coldplug (device, backend->priv->daemon, G_OBJECT (native));
diff --git a/src/linux/up-device-csr.c b/src/linux/up-device-csr.c
deleted file mode 100644
index 63442d8..0000000
--- a/src/linux/up-device-csr.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2005-2010 Richard Hughes <richard@hughsie.com>
- * Copyright (C) 2004 Sergey V. Udaltsov <svu@gnome.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <math.h>
-
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <glib/gprintf.h>
-#include <glib/gi18n-lib.h>
-#include <glib-object.h>
-#include <gudev/gudev.h>
-#include <libusb.h>
-
-#include "sysfs-utils.h"
-#include "up-types.h"
-#include "up-device-csr.h"
-
-#define UP_DEVICE_CSR_REFRESH_TIMEOUT 30L
-
-/* Internal CSR registers */
-#define CSR_P6 0
-#define CSR_P0 1
-#define CSR_P4 2
-#define CSR_P5 3
-#define CSR_P8 4
-#define CSR_P9 5
-#define CSR_PB0 6
-#define CSR_PB1 7
-
-struct UpDeviceCsrPrivate
-{
- gboolean is_dual;
- guint bus_num;
- guint dev_num;
- gint raw_value;
- libusb_context *ctx;
- libusb_device *device;
-};
-
-G_DEFINE_TYPE_WITH_PRIVATE (UpDeviceCsr, up_device_csr, UP_TYPE_DEVICE)
-
-static gboolean up_device_csr_refresh (UpDevice *device);
-
-/**
- * up_device_csr_poll_cb:
- **/
-static gboolean
-up_device_csr_poll_cb (UpDeviceCsr *csr)
-{
- UpDevice *device = UP_DEVICE (csr);
-
- g_debug ("Polling: %s", up_device_get_object_path (device));
- up_device_csr_refresh (device);
-
- /* always continue polling */
- return TRUE;
-}
-
-/**
- * up_device_csr_find_device:
- **/
-static libusb_device *
-up_device_csr_find_device (UpDeviceCsr *csr)
-{
- libusb_device *curr_device = NULL;
- libusb_device **devices = NULL;
- guint8 bus_num;
- guint8 dev_num;
- guint i;
- ssize_t cnt;
-
- g_debug ("Looking for: [%03d][%03d]", csr->priv->bus_num, csr->priv->dev_num);
-
- /* try to find the right device */
- cnt = libusb_get_device_list (csr->priv->ctx, &devices);
- if (cnt < 0) {
-/* need to depend on > libusb1-1.0.9 for libusb_strerror()
- g_warning ("failed to get device list: %s", libusb_strerror (cnt));
- */
- g_warning ("failed to get device list: %d", (int)cnt);
- goto out;
- }
- if (devices == NULL) {
- g_warning ("failed to get device list");
- goto out;
- }
- for (i=0; devices[i] != NULL; i++) {
-
- bus_num = libusb_get_bus_number (devices[i]);
- dev_num = libusb_get_device_address (devices[i]);
- if (bus_num == csr->priv->bus_num &&
- dev_num == csr->priv->dev_num) {
- curr_device = libusb_ref_device (devices[i]);
- break;
- }
- }
-
- libusb_free_device_list (devices, TRUE);
-out:
- return curr_device;
-}
-
-/**
- * up_device_csr_coldplug:
- *
- * Return %TRUE on success, %FALSE if we failed to get data and should be removed
- **/
-static gboolean
-up_device_csr_coldplug (UpDevice *device)
-{
- UpDeviceCsr *csr = UP_DEVICE_CSR (device);
- GUdevDevice *native;
- gboolean ret = FALSE;
- const gchar *type;
- const gchar *native_path;
- const gchar *vendor;
- const gchar *product;
-
- /* get the type */
- native = G_UDEV_DEVICE (up_device_get_native (device));
- type = g_udev_device_get_property (native, "UPOWER_BATTERY_TYPE");
- if (type == NULL)
- goto out;
-
- /* which one? */
- if (g_strcmp0 (type, "mouse") == 0)
- g_object_set (device, "type", UP_DEVICE_KIND_MOUSE, NULL);
- else if (g_strcmp0 (type, "keyboard") == 0)
- g_object_set (device, "type", UP_DEVICE_KIND_KEYBOARD, NULL);
- else {
- g_debug ("not a recognised csr device");
- goto out;
- }
-
- /* get what USB device we are */
- native_path = g_udev_device_get_sysfs_path (native);
- csr->priv->bus_num = sysfs_get_int (native_path, "busnum");
- csr->priv->dev_num = sysfs_get_int (native_path, "devnum");
-
- /* get correct bus numbers? */
- if (csr->priv->bus_num == 0 || csr->priv->dev_num == 0) {
- g_warning ("unable to get bus or device numbers");
- goto out;
- }
-
- /* try to get the usb device */
- csr->priv->device = up_device_csr_find_device (csr);
- if (csr->priv->device == NULL) {
- g_debug ("failed to get device %p", csr);
- goto out;
- }
-
- /* get optional quirk parameters */
- ret = g_udev_device_has_property (native, "UPOWER_CSR_DUAL");
- if (ret)
- csr->priv->is_dual = g_udev_device_get_property_as_boolean (native, "UPOWER_CSR_DUAL");
- g_debug ("is_dual=%i", csr->priv->is_dual);
-
- /* prefer UPOWER names */
- vendor = g_udev_device_get_property (native, "UPOWER_VENDOR");
- if (vendor == NULL)
- vendor = g_udev_device_get_property (native, "ID_VENDOR");
- product = g_udev_device_get_property (native, "UPOWER_PRODUCT");
- if (product == NULL)
- product = g_udev_device_get_property (native, "ID_PRODUCT");
-
- /* hardcode some values */
- g_object_set (device,
- "vendor", vendor,
- "model", product,
- "power-supply", FALSE,
- "is-present", TRUE,
- "is-rechargeable", TRUE,
- "state", UP_DEVICE_STATE_DISCHARGING,
- "has-history", TRUE,
- NULL);
-
- /* coldplug */
- ret = up_device_csr_refresh (device);
- if (!ret)
- goto out;
-
- /* set up a poll */
- up_daemon_start_poll (G_OBJECT (device), (GSourceFunc) up_device_csr_poll_cb);
-out:
- return ret;
-}
-
-/**
- * up_device_csr_refresh:
- *
- * Return %TRUE on success, %FALSE if we failed to refresh or no data
- **/
-static gboolean
-up_device_csr_refresh (UpDevice *device)
-{
- gboolean ret = FALSE;
- UpDeviceCsr *csr = UP_DEVICE_CSR (device);
- libusb_device_handle *handle = NULL;
- guint8 buf[80];
- guint addr;
- gdouble percentage;
- gint retval;
-
- /* ensure we still have a device */
- if (csr->priv->device == NULL) {
- g_warning ("no device!");
- goto out;
- }
-
- /* open USB device */
- retval = libusb_open (csr->priv->device, &handle);
- if (retval < 0) {
- g_warning ("could not open device: %i", retval);
- goto out;
- }
-
- /* For dual receivers C502, C504 and C505, the mouse is the
- * second device and uses an addr of 1 in the value and index
- * fields' high byte */
- addr = csr->priv->is_dual ? 1<<8 : 0;
-
- /* get the charge */
- retval = libusb_control_transfer (handle, 0xc0, 0x09, 0x03|addr, 0x00|addr,
- buf, 8, UP_DEVICE_CSR_REFRESH_TIMEOUT);
- if (retval < 0) {
- g_warning ("failed to write to device: %i", retval);
- goto out;
- }
-
- /* ensure we wrote 8 bytes */
- if (retval != 8) {
- g_warning ("failed to write to device, wrote %i bytes", retval);
- goto out;
- }
-
- /* is a C504 receiver busy? */
- if (buf[CSR_P0] == 0x3b && buf[CSR_P4] == 0) {
- g_warning ("receiver busy");
- goto out;
- }
-
- /* get battery status */
- csr->priv->raw_value = buf[CSR_P5] & 0x07;
- g_debug ("charge level: %d", csr->priv->raw_value);
- if (csr->priv->raw_value != 0) {
- percentage = (100.0 / 7.0) * csr->priv->raw_value;
- g_object_set (device, "percentage", percentage, NULL);
- g_debug ("percentage=%f", percentage);
- }
-
- /* reset time */
- g_object_set (device, "update-time", (guint64) g_get_real_time () / G_USEC_PER_SEC, NULL);
-
- /* success */
- ret = TRUE;
-out:
- if (handle != NULL)
- libusb_close (handle);
- return ret;
-}
-
-/**
- * up_device_csr_init:
- **/
-static void
-up_device_csr_init (UpDeviceCsr *csr)
-{
- gint retval;
- csr->priv = up_device_csr_get_instance_private (csr);
-
- csr->priv->raw_value = -1;
- retval = libusb_init (&csr->priv->ctx);
- if (retval < 0)
- g_warning ("could not initialize libusb: %i", retval);
-}
-
-/**
- * up_device_csr_finalize:
- **/
-static void
-up_device_csr_finalize (GObject *object)
-{
- UpDeviceCsr *csr;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (UP_IS_DEVICE_CSR (object));
-
- csr = UP_DEVICE_CSR (object);
- g_return_if_fail (csr->priv != NULL);
-
- if (csr->priv->ctx != NULL)
- libusb_exit (csr->priv->ctx);
- up_daemon_stop_poll (object);
-
- G_OBJECT_CLASS (up_device_csr_parent_class)->finalize (object);
-}
-
-/**
- * up_device_csr_class_init:
- **/
-static void
-up_device_csr_class_init (UpDeviceCsrClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- UpDeviceClass *device_class = UP_DEVICE_CLASS (klass);
-
- object_class->finalize = up_device_csr_finalize;
- device_class->coldplug = up_device_csr_coldplug;
- device_class->refresh = up_device_csr_refresh;
-}
-
-/**
- * up_device_csr_new:
- **/
-UpDeviceCsr *
-up_device_csr_new (void)
-{
- return g_object_new (UP_TYPE_DEVICE_CSR, NULL);
-}
-
diff --git a/src/linux/up-device-csr.h b/src/linux/up-device-csr.h
deleted file mode 100644
index 65e7f35..0000000
--- a/src/linux/up-device-csr.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2008 David Zeuthen <davidz@redhat.com>
- * Copyright (C) 2008 Richard Hughes <richard@hughsie.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifndef __UP_DEVICE_CSR_H__
-#define __UP_DEVICE_CSR_H__
-
-#include <glib-object.h>
-#include "up-device.h"
-
-G_BEGIN_DECLS
-
-#define UP_TYPE_DEVICE_CSR (up_device_csr_get_type ())
-#define UP_DEVICE_CSR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), UP_TYPE_DEVICE_CSR, UpDeviceCsr))
-#define UP_DEVICE_CSR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), UP_TYPE_DEVICE_CSR, UpDeviceCsrClass))
-#define UP_IS_DEVICE_CSR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), UP_TYPE_DEVICE_CSR))
-#define UP_IS_DEVICE_CSR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), UP_TYPE_DEVICE_CSR))
-#define UP_DEVICE_CSR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), UP_TYPE_DEVICE_CSR, UpDeviceCsrClass))
-
-typedef struct UpDeviceCsrPrivate UpDeviceCsrPrivate;
-
-typedef struct
-{
- UpDevice parent;
- UpDeviceCsrPrivate *priv;
-} UpDeviceCsr;
-
-typedef struct
-{
- UpDeviceClass parent_class;
-} UpDeviceCsrClass;
-
-GType up_device_csr_get_type (void);
-UpDeviceCsr *up_device_csr_new (void);
-
-G_END_DECLS
-
-#endif /* __UP_DEVICE_CSR_H__ */
-
--
2.29.2
From 64582256a8c75127c3de23f5542c8467e2e9484a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 19 Jan 2021 13:31:25 +0100
Subject: [PATCH 2/2] build: Remove libusb dependency in Linux
As the last user, the CSR support code, was removed.
---
configure.ac | 1 -
src/Makefile.am | 2 --
src/linux/Makefile.am | 1 -
3 files changed, 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5f08d91..9db579f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,6 @@ AC_SUBST(BACKEND, "$with_backend")
have_idevice=no
if test x$with_backend = xlinux; then
PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 147])
- PKG_CHECK_MODULES(USB, [libusb-1.0 >= 1.0.0])
AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without libimobiledevice]),
with_idevice=$withval,with_idevice=yes)
LIBPLIST_DEP=libplist
diff --git a/src/Makefile.am b/src/Makefile.am
index 3400139..81f5566 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,7 +69,6 @@ upowerd_CPPFLAGS = \
upowerd_LDADD = \
-lm \
- $(USB_LIBS) \
$(GIO_LIBS) \
$(GIO_UNIX_LIBS) \
$(UPOWER_LIBS)
@@ -94,7 +93,6 @@ endif
if BACKEND_TYPE_LINUX
upowerd_LDADD += \
linux/libupshared.la \
- $(USB_LIBS) \
$(GUDEV_LIBS) \
$(IDEVICE_LIBS) \
$(NULL)
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index 82f60fd..5f3475d 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"UPower-Linux\" \
-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
-I$(top_srcdir)/libupower-glib \
- $(USB_CFLAGS) \
$(GIO_CFLAGS) \
$(GIO_UNIX_CFLAGS) \
$(GUDEV_CFLAGS) \
--
2.29.2

View file

@ -1,82 +1,83 @@
%global commit 93cfe7c8d66ed486001c4f3f55399b7a
Summary: Power Management Service
Name: upower
Version: 0.99.11
Release: 9%{?dist}
License: GPLv2+
URL: http://upower.freedesktop.org/
Source0: https://gitlab.freedesktop.org/upower/upower/uploads/%{commit}/%{name}-%{version}.tar.xz
Version: 1.91.0
Release: %autorelease
License: GPL-2.0-or-later
URL: https://upower.freedesktop.org/
Source0: https://gitlab.freedesktop.org/upower/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
Patch0: 0001-linux-Add-support-for-iPhone-XR-XS-models.patch
Patch1: 0001-build-Use-a-newer-libplist-if-available.patch
Patch2: upower-no-usb-dep.patch
BuildRequires: make
BuildRequires: sqlite-devel
BuildRequires: meson
BuildRequires: git
BuildRequires: libtool
BuildRequires: gettext
BuildRequires: libgudev1-devel
%define idevice disabled
%ifnarch s390 s390x
%if ! 0%{?rhel}
%define idevice enabled
BuildRequires: libimobiledevice-devel
%endif
%endif
BuildRequires: glib2-devel >= 2.6.0
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: polkit-devel
BuildRequires: systemd
# Only required while we're patching configure.ac
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: udev
Requires: gobject-introspection
%if 0%{?fedora}
# From rhughes-f20-gnome-3-12 copr
Obsoletes: compat-upower09 < 0.99
%endif
%description
UPower (formerly DeviceKit-power) provides a daemon, API and command
line tools for managing power devices attached to the system.
%package libs
Summary: Client libraries for UPower
Requires: gobject-introspection
Recommends: %{name}%{?_isa} = %{version}-%{release}
Conflicts: %{name} < 0.99.20-4
%description libs
Client libraries for UPower.
%package devel
Summary: Headers and libraries for UPower
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Headers and libraries for UPower.
%package devel-docs
Summary: Developer documentation for for libupower-glib
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
BuildArch: noarch
%description devel-docs
Developer documentation for for libupower-glib.
%package tests
Summary: Test files for Upower
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests
Test files for Upower
%prep
%autosetup -p1 -S git
%autosetup -n %{name}-v%{version} -p1 -S git
%build
autoreconf -i
%configure \
--enable-gtk-doc \
--disable-static \
--enable-introspection \
%ifarch s390 s390x
--with-backend=dummy
%endif
%meson \
-Didevice=%{idevice} \
-Dman=true \
-Dgtk-doc=true \
-Dintrospection=enabled
# Disable SMP build, fails to build docs
make
%meson_build
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%meson_install
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
mv $RPM_BUILD_ROOT%{_libexecdir}/upower $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
%find_lang upower
@ -94,23 +95,28 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%files -f upower.lang
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc NEWS AUTHORS HACKING README
%{_libdir}/libupower-glib.so.*
%doc NEWS AUTHORS HACKING.md README.md
%{_datadir}/dbus-1/system.d/*.conf
%ifnarch s390 s390x
%{_udevrulesdir}/*.rules
%endif
%{_udevhwdbdir}/*.hwdb
%ghost %dir %{_localstatedir}/lib/upower
%dir %{_sysconfdir}/UPower
%config %{_sysconfdir}/UPower/UPower.conf
%{_bindir}/*
%{_libexecdir}/*
%{_libdir}/girepository-1.0/*.typelib
%{_sysconfdir}/UPower/UPower.conf.d/README.md
%{_bindir}/upower
%{_libexecdir}/upowerd
%{_mandir}/man1/*
%{_mandir}/man7/*
%{_mandir}/man8/*
%{_datadir}/dbus-1/system-services/*.service
%{_unitdir}/*.service
%{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
%{_datadir}/zsh/*
%files libs
%license COPYING
%{_libdir}/libupower-glib.so.3{,.*}
%{_libdir}/girepository-1.0/*.typelib
%files devel
%{_datadir}/dbus-1/interfaces/*.xml
@ -126,266 +132,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%dir %{_datadir}/gtk-doc/html/UPower
%{_datadir}/gtk-doc/html/UPower/*
%files tests
%{_libexecdir}/installed-tests/upower
%dir %{_datadir}/installed-tests/
%dir %{_datadir}/installed-tests/upower/
%{_datadir}/installed-tests/upower/upower-integration.test
%changelog
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.11-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 19 2021 Bastien Nocera <bnocera@redhat.com> - 0.99.11-8
+ upower-0.99.11-8
- Remove USB dependency
* Tue Nov 24 2020 Bastien Nocera <bnocera@redhat.com> - 0.99.11-7
+ upower-0.99.11-7
- Disable libimobiledevice integration on RHEL
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jun 17 2020 Bastien Nocera <bnocera@redhat.com> - 0.99.11-5
+ upower-0.99.11-5
- Use upstreamed libplist patch
- Add support for iPhone XS,XR
* Tue Jun 16 2020 Adam Williamson <awilliam@redhat.com> - 0.99.11-4
- Fix imobiledevice support with new libplist, rebuild for soname bumps
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Sep 4 2019 Christian Kellner <ckellner@redhat.com> - 0.99.11-2
- Add systemd service snippets
- Use macros for _unitdir and _udevrulesdir
- Mark _datadir/gtk-doc as directory
* Tue Sep 3 2019 Christian Kellner <ckellner@redhat.com> - 0.99.11-1
- New upstream release 0.99.11
- Intltool has been replaced by gettext
- D-Bus configuration moved from sysconfdir to datadir
- Systemd is creating /var/lib/upower, so 'ghost' the dir
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Feb 20 2019 Christian Kellner <ckellner@redhat.com> - 0.99.10-1
- New upstream release with the following changes:
- Set 'pending-charge' for DisplayDevice if at least one battery is in
the 'pending-charge' state
- Map pending-charge to fully-charged when charge is 100%
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 20 2018 Christian Kellner <ckellner@redhat.com> - 0.99.9-1
- New upstream release
- Drop unneccessary patch to fix udev events access
- Fix daemon lockdown issues (keyboard backlight, AC status changes)
- Out-of-tree build fixes and documentation fixes
* Sun Oct 07 2018 Kalev Lember <klember@redhat.com> - 0.99.8-3
- Backport an upstream fix for upower not having access to udev events
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Bastien Nocera <bnocera@redhat.com> - 0.99.8-1
+ upower-0.99.8-1
- Update to 0.99.8
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.99.7-2
- Switch to %%ldconfig_scriptlets
* Tue Nov 28 2017 Bastien Nocera <bnocera@redhat.com> - 0.99.7-1
+ upower-0.99.7-1
- Update to 0.99.7
- Add Bluetooth LE battery support
- Fix critical action after resume from hibernate
* Mon Sep 11 2017 Richard Hughes <rhughes@redhat.com> - 0.99.6-1
- New upstream release
- Detect joysticks as gaming input devices
- Fix crash when '@' is present in the device name
- Grab the model name from device if unavailable from battery
* Thu Aug 24 2017 Benjamin Berg <bberg@redhat.com> - 0.99.5-4
- Add patch to not correctly close the inhibitor FD
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Jul 24 2017 Richard Hughes <rhughes@redhat.com> - 0.99.5-1
- New upstream release
- Add BatteryLevel property for devices with a finite number of power levels
- Add support for pausing and resuming of the daemon poll
- Do not spin in a loop when /proc/timer_stats cannot be written
- Fix reading and writing the keyboard brightness level
- Get a serial number for device batteries
- Refresh devices after waking up from sleep
- Lower initial power usage when iDevice isn't accessible
* Tue Feb 14 2017 Dan Horák <dan[at]danny.cz> - 0.99.4-4
- Add explicit BR:systemd to fix s390(x) build
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Mar 14 2016 Bastien Nocera <bnocera@redhat.com> 0.99.4-2
- Fix getting the critical action
* Tue Feb 16 2016 Richard Hughes <rhughes@redhat.com> - 0.99.4-1
- New upstream release
- Add support for Logitech G700s/G700 Gaming Mouse
- Change the default low battery policy to percentage
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu May 28 2015 Richard Hughes <rhughes@redhat.com> - 0.99.3-1
- New upstream release
- Fix several crashes
- Properly detect bluetooth mice and keyboards that are HID devices
- Support Logitech Unifying in Linux 3.19
- Work-around broken battery on the Onda v975w
* Wed Mar 18 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.99.2-4
- pull in upstream crash fix (#1128390)
- use %%autosetup
- -devel: tighten subpkg dep via %%_isa
- -devel-docs: fix Summary
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.99.2-3
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
* Wed Feb 11 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.99.2-2
- Rebuild (libimobiledevice)
- Use %%license
* Thu Dec 18 2014 Richard Hughes <rhughes@redhat.com> - 0.99.2-1
- New upstream release
- Fix various memory and reference leaks
- Respect the CriticalPowerAction config option
- Set update-time on the aggregate device
- Update display device when battery is removed
* Sun Nov 16 2014 Kalev Lember <kalevlember@gmail.com> - 0.99.1-3
- Obsolete compat-upower09 from rhughes-f20-gnome-3-12 copr
* Wed Oct 15 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.99.1-2
- Rebuild for libimobiledevice 1.1.7
* Mon Aug 18 2014 Richard Hughes <rhughes@redhat.com> - 0.99.1-1
- New upstream release
- Create the history directory at runtime
- Do not log a critical warning when using _set_object_path_sync()
- Fix API doc for up_client_get_on_battery()
- Fix possible UpHistoryItem leak on failure
- Fix segfault on getting property when daemon is not running
- Fix shutdown on boot on some machines
- Fix small memleak on startup with Logitech devices
- Free the obtained device list array after use
- Remove IsDocked property
- Remove unused polkit dependency
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 0.99.0-6
- Rebuilt for gobject-introspection 1.41.4
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon May 5 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.99.0-4
- Rebuild for libimobiledevice 1.1.6
* Mon Mar 17 2014 Richard Hughes <rhughes@redhat.com> - 0.99.0-3
- Split out a new devel-docs subpackage to fix multilib_policy=all installs.
- Resolves: #1070661
* Fri Nov 08 2013 Bastien Nocera <bnocera@redhat.com> 0.99.0-2
- Fix crash when D-Bus isn't available
* Tue Oct 29 2013 Richard Hughes <rhughes@redhat.com> - 0.99.0-1
- New upstream release
- This version contains major API changes and bumps library soname.
- Add DisplayDevice composite battery
- Add WarningLevel and IconName properties to all devices
- Clamp percentage for overfull batteries
- Emit PropertiesChanged signals
- Enforce critical battery policy on the daemon side
- Reduce client-side and daemon-side wake-ups
- Register objects on the bus once they've been setup
- Remove DeviceChanged and Changed signals
- Remove OnLowBattery property (use WarningLevel instead)
- Remove QoS support
- Remove battery recall support
* Fri Oct 18 2013 Richard Hughes <rhughes@redhat.com> - 0.9.23-1
- New upstream release
- Add missing dbus-glib-1 to private requires
- Avoid trying to close fd that wasn't opened
- Disable Watts-Up devices by default
- Don't guess discharging state for devices
- Fix crasher calling _about_to_sleep_sync()
- Really don't overwrite retval with prop values
- Update and correct Toshiba recall list
* Wed Oct 09 2013 Bastien Nocera <bnocera@redhat.com> 0.9.22-1
- Update to 0.9.22
- Fixes incorrect reporting of some properties
- Fixes battery values for Logitech unifying devices
- Bluetooth input devices support
- Device name fixes
* Fri Jul 26 2013 Richard Hughes <rhughes@redhat.com> - 0.9.21-1
- New upstream release
- Add support for Logitech Wireless (NonUnifying) devices
- Allow clients to call org.freedesktop.DBus.Peer
- Update the upower man page with all the current options
- Use PIE to better secure installed tools and also use full RELRO in the daemon
* Thu Apr 25 2013 Matthias Clasen <mclasen@redhat.com> - 0.9.20-3
- Enabled hardened build
- Don't use /lib/udev in file paths
* Tue Mar 19 2013 Matthias Clasen <mclasen@redhat.com> - 0.9.20-2
- Rebuild
* Mon Mar 11 2013 Richard Hughes <rhughes@redhat.com> - 0.9.20-1
- New upstream release
- Add a --enable-deprecated configure argument to remove pm-utils support
- Deprecate running the powersave scripts
- Factor out the Logitech Unifying support to support other devices
- Require unfixed applications to define UPOWER_ENABLE_DEPRECATED
- Fix batteries which report current energy but full charge
- Fix several small memory leaks
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jan 02 2013 Richard Hughes <rhughes@redhat.com> - 0.9.19-1
- New upstream release
- Add a Documentation tag to the service file
- Add support for Logitech Unifying devices
- Do not continue to poll if /proc/timer_stats is not readable
- Fix device matching for recent kernels
- Resolves: #848521
* Wed Oct 24 2012 Dan Horák <dan[at]danny.cz> - 0.9.18-2
- the notify-upower script is not installed with dummy backend on s390(x)
* Wed Aug 08 2012 Richard Hughes <rhughes@redhat.com> - 0.9.18-1
- New upstream release
- Use systemd for suspend and hibernate
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
%autochangelog