Compare commits

...

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

2
.gitignore vendored

@ -1 +1 @@
SOURCES/upower-0.99.13.tar.xz
SOURCES/upower-v1.90.6.tar.bz2

@ -1 +1 @@
243293648009763df9fe46aec9390cedfa129a3b SOURCES/upower-0.99.13.tar.xz
4d1a005e5dd6bb907e7dae79753e98891888de36 SOURCES/upower-v1.90.6.tar.bz2

@ -0,0 +1,26 @@
From 9ee76826bd41a5d3a377dfd6f5835f42ec50be9a Mon Sep 17 00:00:00 2001
From: Stuart Hayhurst <stuart.a.hayhurst@gmail.com>
Date: Wed, 25 Sep 2024 16:56:11 +0100
Subject: [PATCH] Fix race condition in test_sibling_priority_no_overwrite
---
src/linux/integration-test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/linux/integration-test.py b/src/linux/integration-test.py
index 6b1514a9..f6c804a4 100755
--- a/src/linux/integration-test.py
+++ b/src/linux/integration-test.py
@@ -3148,8 +3148,8 @@ class Tests(dbusmock.DBusTestCase):
def test_sibling_priority_no_overwrite(self):
'Test siblings using the fallback device do not overwrite previous guesses'
- self.start_daemon()
self.testbed.add_from_file(os.path.join(edir, 'tests/wacom-pen-digitiser.device'))
+ self.start_daemon()
self.assertDevs({
'battery_wacom_battery_0': {
--
GitLab

@ -0,0 +1,43 @@
From 7d7bb84fde91bef9ee7eba924cbdfa74639cc4fe Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Tue, 18 Jun 2024 15:04:29 +0800
Subject: [PATCH] linux: up-enumerator-udev: Find the correct parent id for
input devices
The parent id for the devices under "/sys/devices/virtual/misc/uhid/*"
points to /sys/devices/virtual/misc/uhid. It will cause the device
information to be updated incorrectly. For example, the type for a mouse is
updated to "keyboard". This patch makes sure the correct parent id for
each input device.
Resolves: #268 #286
---
src/linux/up-enumerator-udev.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/linux/up-enumerator-udev.c b/src/linux/up-enumerator-udev.c
index 36e3887b..553f6524 100644
--- a/src/linux/up-enumerator-udev.c
+++ b/src/linux/up-enumerator-udev.c
@@ -66,8 +66,17 @@ device_parent_id (GUdevDevice *dev)
return NULL;
/* Continue walk if the parent is a "hid" device */
- if (g_strcmp0 (subsystem, "hid") == 0)
+ if (g_strcmp0 (subsystem, "hid") == 0) {
+ /* if the parent is under /sys/devices/virtual/misc/uhid, the device should be input devices
+ * and return the path immediately to make sure they belongs to the correct parent.
+ * for example:
+ * root@fedora:/sys/devices/virtual/misc/uhid# ls
+ * 0005:046D:B01A.0005 0005:05AC:0250.000B dev power subsystem uevent */
+ if (g_strrstr (g_udev_device_get_sysfs_path (parent), "/sys/devices/virtual/misc/uhid"))
+ return g_strdup (g_udev_device_get_sysfs_path (parent));
+
return device_parent_id (parent);
+ }
/* Also skip over USB interfaces, we care about full devices */
if (g_strcmp0 (subsystem, "usb") == 0 &&
--
GitLab

@ -1,78 +1,88 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 2;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
Summary: Power Management Service
Name: upower
Version: 0.99.13
Release: 2%{?dist}
License: GPLv2+
Version: 1.90.6
Release: %autorelease
License: GPL-2.0-or-later
URL: http://upower.freedesktop.org/
Source0: https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz
Source0: https://gitlab.freedesktop.org/upower/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
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
# https://gitlab.freedesktop.org/upower/upower/-/commit/9ee76826bd41a5d3a377dfd6f5835f42ec50be9a.patch
Patch1001: 0001-Fix-race-condition-in-test_sibling_priority_no_overwrite.patch
# https://gitlab.freedesktop.org/upower/upower/-/commit/7d7bb84fde91bef9ee7eba924cbdfa74639cc4fe.patch
Patch1002: 0002-linux-up-enumerator-udev-Find-the.patch
%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.
%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
%find_lang upower
@ -91,22 +101,26 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc NEWS AUTHORS HACKING README
%{_libdir}/libupower-glib.so.*
%{_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
%{_mandir}/man1/*
%{_mandir}/man7/*
%{_mandir}/man8/*
%{_datadir}/dbus-1/system-services/*.service
%{_unitdir}/*.service
%{_datadir}/installed-tests/upower/upower-integration.test
%{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
%files libs
%license COPYING
%{_libdir}/libupower-glib.so.3{,.*}
%{_libdir}/girepository-1.0/*.typelib
%files devel
%{_datadir}/dbus-1/interfaces/*.xml
@ -123,20 +137,92 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_datadir}/gtk-doc/html/UPower/*
%changelog
* Mon Aug 23 2021 Benjamin Berg <bberg@redhat.com> - 0.99.13-2
- Rebuild with updated test dependencies
Related: #1994639
## START: Generated by rpmautospec
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.90.6-2
- Bump release for October 2024 mass rebuild:
* Tue Oct 15 2024 Kate Hsuan <hpa@redhat.com> - 1.90.6-1
- Update to upstream version 1.90.6
- Update to the upstream version 1.90.6
- Include a fix patch for "incorrect external device battery update" issue.
Link: https://gitlab.freedesktop.org/upower/upower/-
/commit/7d7bb84fde91bef9ee7eba924cbdfa74639cc4fe
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.90.4-3
- Bump release for June 2024 mass rebuild
* Tue May 28 2024 Kate Hsuan <hpa@redhat.com> - 1.90.4-2
- Add gating definition for RHEL-10
* Wed Apr 24 2024 Kate Hsuan <hpa@redhat.com> - 1.90.4-1
- RHEL-32340 Update to release 1.90.4
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.90.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 28 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.90.2-3
- Rebuilt for libimobiledevice and libplist soname bump
* Mon Aug 23 2021 Benjamin Berg <bberg@redhat.com> - 0.99.13-1
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.90.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jul 06 2023 Bastien Nocera <hadess@hadess.net> - 1.90.2-1
- Update to 1.90.2
* Tue Jul 04 2023 Bastien Nocera <hadess@hadess.net> - 1.90.1-1
- Update to 1.90.1
* Wed Feb 22 2023 Richard Hughes <richard@hughsie.com> - 0.99.20-5
- migrated to SPDX license
* Sun Feb 19 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.99.20-4
- Separate libs package
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.20-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 15 2022 Benjamin Berg <bberg@redhat.com> - 0.99.20-1
- Update to 0.99.20
* Thu Jun 09 2022 Benjamin Berg <bberg@redhat.com> - 0.99.19-1
- Update to 0.99.19
* Thu Jun 09 2022 Benjamin Berg <bberg@redhat.com> - 0.99.14-6
- Remove sqlite build dependency
* Thu Jun 09 2022 Benjamin Berg <bberg@redhat.com> - 0.99.14-5
- Remove unused commit global
* Thu Jun 09 2022 Benjamin Berg <bberg@redhat.com> - 0.99.14-4
- Remove ancient Obsoletes: line
* Thu Jun 09 2022 Benjamin Berg <bberg@redhat.com> - 0.99.14-3
- Build linux backend on s390
* 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
Resolves: #1994639
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.99.11-11
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.99.11-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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
@ -400,3 +486,5 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
* 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
## END: Generated by rpmautospec

Loading…
Cancel
Save