From d1c1292c585f93ce6b33bd48f257de6416cb6689cd6bf505755954aecd8b7377 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 10 Oct 2023 19:01:03 +0000 Subject: [PATCH 1/4] Accepting request 1116643 from home:iznogood:factory - Add explicit /usr/bin/dbus-daemon BuildRequires: needed for test OBS-URL: https://build.opensuse.org/request/show/1116643 OBS-URL: https://build.opensuse.org/package/show/Base:System/power-profiles-daemon?expand=0&rev=17 --- power-profiles-daemon.changes | 5 +++++ power-profiles-daemon.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/power-profiles-daemon.changes b/power-profiles-daemon.changes index 741d209..4644a98 100644 --- a/power-profiles-daemon.changes +++ b/power-profiles-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 10 10:13:03 UTC 2023 - Bjørn Lie + +- Add explicit /usr/bin/dbus-daemon BuildRequires: needed for test + ------------------------------------------------------------------- Wed Apr 26 15:19:01 UTC 2023 - Enrico Belleri diff --git a/power-profiles-daemon.spec b/power-profiles-daemon.spec index b53fe85..22f4661 100644 --- a/power-profiles-daemon.spec +++ b/power-profiles-daemon.spec @@ -35,9 +35,12 @@ BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gudev-1.0) >= 234 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114 BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(umockdev-1.0) +BuildRequires: pkgconfig(upower-glib) +# Needed for tests +BuildRequires: /usr/bin/dbus-daemon + Requires: polkit %description From a9b91a582f4a9e492af70e5e3ad8d273ffeeaf69581baa8c7d40f5b753d32388 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Wed, 11 Oct 2023 16:56:08 +0000 Subject: [PATCH 2/4] revert r17 OBS-URL: https://build.opensuse.org/package/show/Base:System/power-profiles-daemon?expand=0&rev=18 --- power-profiles-daemon.changes | 5 ----- power-profiles-daemon.spec | 3 --- 2 files changed, 8 deletions(-) diff --git a/power-profiles-daemon.changes b/power-profiles-daemon.changes index 4644a98..741d209 100644 --- a/power-profiles-daemon.changes +++ b/power-profiles-daemon.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 10 10:13:03 UTC 2023 - Bjørn Lie - -- Add explicit /usr/bin/dbus-daemon BuildRequires: needed for test - ------------------------------------------------------------------- Wed Apr 26 15:19:01 UTC 2023 - Enrico Belleri diff --git a/power-profiles-daemon.spec b/power-profiles-daemon.spec index 22f4661..ca8b0d3 100644 --- a/power-profiles-daemon.spec +++ b/power-profiles-daemon.spec @@ -38,9 +38,6 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(umockdev-1.0) BuildRequires: pkgconfig(upower-glib) -# Needed for tests -BuildRequires: /usr/bin/dbus-daemon - Requires: polkit %description From 50526b70fd39157f98df1c357e7d666033d9acef99913b5bae6c4840ac0af884 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 1 Mar 2024 12:34:05 +0000 Subject: [PATCH 3/4] Accepting request 1148703 from home:iDesmI:branches:Base:System - Remove duplicate DBus service files net.hadess.PowerProfiles (https://bugzilla.opensuse.org/show_bug.cgi?id=1219956#c3) - Update to version 0.20: * Service has new name 'org.freedesktop.UPower.PowerProfiles' * Allow multiple power-profiles-daemon drivers to load simultaneously * amdgpu panel power savings which uses dedicated hardware in systems with integrated Radeon graphics to decrease panel power consumption when the system is on battery - Add python3-shebang.patch: * resolve env-script-interpreter error OBS-URL: https://build.opensuse.org/request/show/1148703 OBS-URL: https://build.opensuse.org/package/show/Base:System/power-profiles-daemon?expand=0&rev=19 --- power-profiles-daemon-0.13.tar.bz2 | 3 --- power-profiles-daemon-0.20.tar.bz2 | 3 +++ power-profiles-daemon.changes | 17 +++++++++++++++++ power-profiles-daemon.spec | 21 +++++++++++++-------- python3-shebang.patch | 10 ++++++++++ 5 files changed, 43 insertions(+), 11 deletions(-) delete mode 100644 power-profiles-daemon-0.13.tar.bz2 create mode 100644 power-profiles-daemon-0.20.tar.bz2 create mode 100644 python3-shebang.patch diff --git a/power-profiles-daemon-0.13.tar.bz2 b/power-profiles-daemon-0.13.tar.bz2 deleted file mode 100644 index a9ba649..0000000 --- a/power-profiles-daemon-0.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fef0a3e1b76e6c0f551841d4a9fef36e6aae047d5279cfc60b833d80fd2a8b7 -size 49079 diff --git a/power-profiles-daemon-0.20.tar.bz2 b/power-profiles-daemon-0.20.tar.bz2 new file mode 100644 index 0000000..228580e --- /dev/null +++ b/power-profiles-daemon-0.20.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24a0bf1a3012c4f49fbe146fed6bce9fbb7b20c92e4123690ff727a376cc3b6c +size 58388 diff --git a/power-profiles-daemon.changes b/power-profiles-daemon.changes index 741d209..3cbd2ab 100644 --- a/power-profiles-daemon.changes +++ b/power-profiles-daemon.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Feb 21 12:09:15 UTC 2024 - Enrico Belleri + +- Remove duplicate DBus service files net.hadess.PowerProfiles + +------------------------------------------------------------------- +Thu Feb 15 05:53:07 UTC 2024 - Enrico Belleri + +- Update to version 0.20: + * Service has new name 'org.freedesktop.UPower.PowerProfiles' + * Allow multiple power-profiles-daemon drivers to load simultaneously + * amdgpu panel power savings which uses dedicated hardware in systems with + integrated Radeon graphics to decrease panel power consumption when the + system is on battery +- Add python3-shebang.patch: + * resolve env-script-interpreter error + ------------------------------------------------------------------- Wed Apr 26 15:19:01 UTC 2023 - Enrico Belleri diff --git a/power-profiles-daemon.spec b/power-profiles-daemon.spec index ca8b0d3..ffb64a2 100644 --- a/power-profiles-daemon.spec +++ b/power-profiles-daemon.spec @@ -1,7 +1,7 @@ # # spec file for package power-profiles-daemon # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,26 @@ Name: power-profiles-daemon -Version: 0.13 +Version: 0.20 Release: 0 Summary: Power profiles handling over D-Bus License: GPL-3.0-or-later -URL: https://gitlab.freedesktop.org/hadess/power-profiles-daemon +URL: https://gitlab.freedesktop.org/upower/power-profiles-daemon Source: %{url}/-/archive/%{version}/%{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE hold-profile-hardening.patch boo#1189900 -- Hardening of HoldProfile D-Bus method Patch0: hold-profile-hardening.patch +Patch1: python3-shebang.patch BuildRequires: c_compiler BuildRequires: gtk-doc -BuildRequires: meson >= 0.54.0 +BuildRequires: meson >= 0.59.0 BuildRequires: pkgconfig BuildRequires: python3-dbusmock BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gudev-1.0) >= 234 -BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114 +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.91 BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(umockdev-1.0) @@ -65,6 +68,8 @@ This package provides documentation for %{name}. %install %meson_install +rm -f %{buildroot}%{_datadir}/dbus-1/system.d/net.hadess.PowerProfiles.conf +rm -f %{buildroot}%{_datadir}/dbus-1/system-services/net.hadess.PowerProfiles.service %check %meson_test @@ -87,9 +92,9 @@ This package provides documentation for %{name}. %{_bindir}/powerprofilesctl %{_libexecdir}/%{name} %{_unitdir}/%{name}.service -%{_datadir}/dbus-1/system.d/net.hadess.PowerProfiles.conf -%{_datadir}/dbus-1/system-services/net.hadess.PowerProfiles.service -%{_datadir}/polkit-1/actions/net.hadess.PowerProfiles.policy +%{_datadir}/dbus-1/system.d/org.freedesktop.UPower.PowerProfiles.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.UPower.PowerProfiles.service +%{_datadir}/polkit-1/actions/power-profiles-daemon.policy %ghost %dir %{_localstatedir}/lib/%{name} %files doc diff --git a/python3-shebang.patch b/python3-shebang.patch new file mode 100644 index 0000000..f89bffc --- /dev/null +++ b/python3-shebang.patch @@ -0,0 +1,10 @@ +Index: power-profiles-daemon-0.20/src/powerprofilesctl +=================================================================== +--- power-profiles-daemon-0.20.orig/src/powerprofilesctl ++++ power-profiles-daemon-0.20/src/powerprofilesctl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/python3 + + import argparse + import signal From 378b4b5879184c3c25b8087e81cfcc4795494cbb36a61e181add23f3dea28fe8 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 18 Mar 2024 02:04:52 +0000 Subject: [PATCH 4/4] Accepting request 1157518 from home:pgajdos - remove dependency on /usr/bin/python3 using %python3_fix_shebang macro, [bsc#1212476] OBS-URL: https://build.opensuse.org/request/show/1157518 OBS-URL: https://build.opensuse.org/package/show/Base:System/power-profiles-daemon?expand=0&rev=20 --- power-profiles-daemon.changes | 6 ++++++ power-profiles-daemon.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/power-profiles-daemon.changes b/power-profiles-daemon.changes index 3cbd2ab..6a5344b 100644 --- a/power-profiles-daemon.changes +++ b/power-profiles-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 13 10:12:35 UTC 2024 - pgajdos@suse.com + +- remove dependency on /usr/bin/python3 using + %python3_fix_shebang macro, [bsc#1212476] + ------------------------------------------------------------------- Wed Feb 21 12:09:15 UTC 2024 - Enrico Belleri diff --git a/power-profiles-daemon.spec b/power-profiles-daemon.spec index ffb64a2..8ded3e7 100644 --- a/power-profiles-daemon.spec +++ b/power-profiles-daemon.spec @@ -70,6 +70,7 @@ This package provides documentation for %{name}. %meson_install rm -f %{buildroot}%{_datadir}/dbus-1/system.d/net.hadess.PowerProfiles.conf rm -f %{buildroot}%{_datadir}/dbus-1/system-services/net.hadess.PowerProfiles.service +%python3_fix_shebang %check %meson_test