From d3a7415c18f90288e84fb42d161f525ecc30120d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 Mar 2015 14:23:44 -0500 Subject: [PATCH 01/62] Drop sysvinit subpackage in F23+ --- acpid.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 63f1897..850f05a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -32,6 +32,7 @@ Requires: systemd %description acpid is a daemon that dispatches ACPI events to user-space programs. +%if 0%{?fedora} < 23 %package sysvinit Summary: ACPI Event Daemon Group: System Environment/Daemons @@ -40,6 +41,7 @@ Requires(preun): /sbin/service %description sysvinit The acpid-sysvinit contains SysV initscript. +%endif %prep %setup -q @@ -67,8 +69,10 @@ install -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh install -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid +%if 0%{?fedora} < 23 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid +%endif %clean @@ -94,8 +98,10 @@ rm -rf %{buildroot} %{_mandir}/man8/acpi_listen.8.gz %{_mandir}/man8/kacpimon.8.gz +%if 0%{?fedora} < 23 %files sysvinit %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid +%endif %pre if [ "$1" = "2" ]; then @@ -122,11 +128,16 @@ fi /sbin/chkconfig --del acpid >/dev/null 2>&1 || : /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : +%if 0%{?fedora} < 23 %triggerpostun -n %{name}-sysvinit -- %{name} < 2.0.10-2 /sbin/chkconfig --add acpid >/dev/null 2>&1 || : +%endif %changelog +* Thu Mar 05 2015 Adam Jackson 2.0.23-2 +- Drop sysvinit subpackage in F23+ + * Tue Aug 26 2014 Jaroslav Škarvada - 2.0.23-1 - New version Resolves: rhbz#1133263 From 57bfcdb787eb3b31b8c9d5d21317ac5958485c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 19 May 2015 12:08:06 +0200 Subject: [PATCH 02/62] Changed PATH to /usr/sbin:/usr/bin in power.sh Resolves: rhbz#1192817 --- acpid.power.sh | 2 +- acpid.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index 5877321..5e0da13 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -1,6 +1,6 @@ #!/bin/sh -PATH=/sbin:/bin:/usr/bin +PATH=/usr/sbin:/usr/bin # Check session status using systemd session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') diff --git a/acpid.spec b/acpid.spec index 850f05a..b47b74d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Tue May 19 2015 Jaroslav Škarvada - 2.0.23-3 +- Changed PATH to /usr/sbin:/usr/bin in power.sh + Resolves: rhbz#1192817 + * Thu Mar 05 2015 Adam Jackson 2.0.23-2 - Drop sysvinit subpackage in F23+ From 8e256bb60b9550380f6fb037e89edc741b7d6c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 19 May 2015 12:11:34 +0200 Subject: [PATCH 03/62] Changed PATH to /usr/sbin:/usr/bin in power.sh Resolves: rhbz#1192817 --- acpid.power.sh | 2 +- acpid.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index 5877321..5e0da13 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -1,6 +1,6 @@ #!/bin/sh -PATH=/sbin:/bin:/usr/bin +PATH=/usr/sbin:/usr/bin # Check session status using systemd session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') diff --git a/acpid.spec b/acpid.spec index 63f1897..9189d4f 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,10 @@ fi %changelog +* Tue May 19 2015 Jaroslav Škarvada - 2.0.23-2 +- Changed PATH to /usr/sbin:/usr/bin in power.sh + Resolves: rhbz#1192817 + * Tue Aug 26 2014 Jaroslav Škarvada - 2.0.23-1 - New version Resolves: rhbz#1133263 From 60e8ba8c00c22fc19be2f7da385832d09671c287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 2 Jun 2015 10:17:24 +0200 Subject: [PATCH 04/62] Used socket for stdin to support socket activation --- acpid.service | 1 + acpid.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/acpid.service b/acpid.service index fef3569..e7d0987 100644 --- a/acpid.service +++ b/acpid.service @@ -4,6 +4,7 @@ Documentation=man:acpid(8) Requires=acpid.socket [Service] +StandardInput=socket EnvironmentFile=/etc/sysconfig/acpid ExecStart=/usr/sbin/acpid -f $OPTIONS diff --git a/acpid.spec b/acpid.spec index b47b74d..04efe64 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Tue Jun 2 2015 Jaroslav Škarvada - 2.0.23-4 +- Used socket for stdin to support socket activation + * Tue May 19 2015 Jaroslav Škarvada - 2.0.23-3 - Changed PATH to /usr/sbin:/usr/bin in power.sh Resolves: rhbz#1192817 From 85e74bac860e18c2e4f996ca21a885dd689eeadb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:35:38 +0000 Subject: [PATCH 05/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 04efe64..bee936e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.23 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.0.23-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Jun 2 2015 Jaroslav Škarvada - 2.0.23-4 - Used socket for stdin to support socket activation From ba574e01a249d4dcac14008656b55a33ad442114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Aug 2015 12:06:41 +0200 Subject: [PATCH 06/62] New version Resolves: rhbz#1253985 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index bee936e..bfb26c6 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.23 -Release: 5%{?dist} +Version: 2.0.25 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Mon Aug 17 2015 Jaroslav Škarvada - 2.0.25-1 +- New version + Resolves: rhbz#1253985 + * Tue Jun 16 2015 Fedora Release Engineering - 2.0.23-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index e6f8f81..6e7e24f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7bcdcdefcd53b03730e50ba842554ea acpid-2.0.23.tar.xz +69bb0cc4a0a89eb2dfecc4851087f568 acpid-2.0.25.tar.xz From 48dcc21e3f191ad8dab268b88de09f0381f38f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 2 Sep 2015 12:32:48 +0200 Subject: [PATCH 07/62] Simplified macros check related to hardening --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index bfb26c6..f14b512 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,14 +1,14 @@ # hardened build if not overrided %{!?_hardened_build:%global _hardened_build 1} -%if %{?_hardened_build:%{_hardened_build}}%{!?_hardened_build:0} +%if %{?_hardened_build}%{!?_hardened_build:0} %global harden -pie -Wl,-z,relro,-z,now %endif Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-2 +- Simplified macros check related to hardening + * Mon Aug 17 2015 Jaroslav Škarvada - 2.0.25-1 - New version Resolves: rhbz#1253985 From b858e2c776ad28314ff36820e026ba1bfe1875b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 2 Sep 2015 14:04:50 +0200 Subject: [PATCH 08/62] Fixed typo --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index f14b512..d79add2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,4 +1,4 @@ -# hardened build if not overrided +# hardened build if not overridden %{!?_hardened_build:%global _hardened_build 1} %if %{?_hardened_build}%{!?_hardened_build:0} @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-3 +- Fixed typo + * Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-2 - Simplified macros check related to hardening From 006f2bba367e3a5817551996bdc88c846eb84541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 12 Nov 2015 12:08:29 +0100 Subject: [PATCH 09/62] Preserve timestamps on installed files --- acpid.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/acpid.spec b/acpid.spec index d79add2..4b2f478 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -63,15 +63,15 @@ mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/sysconfig chmod 755 %{buildroot}%{_sysconfdir}/acpi/events -install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/acpi/events/videoconf -install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/acpi/events/powerconf -install -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh -install -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} -install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid +install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/acpi/events/videoconf +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/acpi/events/powerconf +install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh +install -p -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} +install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid %if 0%{?fedora} < 23 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d -install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid +install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif @@ -135,6 +135,9 @@ fi %changelog +* Thu Nov 12 2015 Jaroslav Škarvada - 2.0.25-4 +- Preserve timestamps on installed files + * Wed Sep 2 2015 Jaroslav Škarvada - 2.0.25-3 - Fixed typo From 2f2c4e57a46fbc596c895e3f2453628f7926711b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:57:53 +0000 Subject: [PATCH 10/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4b2f478..2d84980 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.25 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.0.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Nov 12 2015 Jaroslav Škarvada - 2.0.25-4 - Preserve timestamps on installed files From e05633f800692569b41aec4020c002444c3d7a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 16 Mar 2016 10:07:17 +0100 Subject: [PATCH 11/62] New version Resolves: rhbz#1299109 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 2d84980..2b946a7 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.25 -Release: 5%{?dist} +Version: 2.0.27 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Mar 16 2016 Jaroslav Škarvada - 2.0.27-1 +- New version + Resolves: rhbz#1299109 + * Wed Feb 03 2016 Fedora Release Engineering - 2.0.25-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 6e7e24f..c784f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69bb0cc4a0a89eb2dfecc4851087f568 acpid-2.0.25.tar.xz +e41bdf628e122edb4342fca432ea7db9 acpid-2.0.27.tar.xz From bc5c27a9dfd60cabe71396f670c5ff4747705eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Jul 2016 16:08:34 +0200 Subject: [PATCH 12/62] Added exception for kded5 to power.sh Resolves: rhbz#1319885 --- acpid.power.sh | 4 ++-- acpid.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index 5e0da13..d6b4c75 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -7,7 +7,7 @@ session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do session_status=$(loginctl session-status ${session}) echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded4\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit @@ -33,7 +33,7 @@ awk ' $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || - $2 ~ /kded4/ || $3 ~ /guidance-power-manager/) \ + $2 ~ /kded[4-5]/ || $3 ~ /guidance-power-manager/) \ { found = 1; exit } END { exit !found } ' || diff --git a/acpid.spec b/acpid.spec index 2b946a7..bae67f5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-2 +- Added exception for kded5 to power.sh + Resolves: rhbz#1319885 + * Wed Mar 16 2016 Jaroslav Škarvada - 2.0.27-1 - New version Resolves: rhbz#1299109 From 4e1e546e4d4bb9d32d82e82236bd932ea6f88648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 20 Jul 2016 16:58:29 +0200 Subject: [PATCH 13/62] Added exception for plasmashell to power.sh Related: rhbz#1319885 --- acpid.power.sh | 11 ++++++----- acpid.spec | 6 +++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index d6b4c75..db59f90 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -7,7 +7,7 @@ session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do session_status=$(loginctl session-status ${session}) echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit @@ -29,12 +29,13 @@ active == "TRUE" && x11 != "" { ps axo uid,cmd | \ awk ' $1 == '$uid_session' && - ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || + ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || - $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || - $2 ~ /kded[4-5]/ || $3 ~ /guidance-power-manager/) \ - { found = 1; exit } + $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || + $2 ~ /kded[4-5]/ || $2 ~ /guidance-power-manager/ || + $2 ~ /plasmashell/) \ + { found = 1; exit } END { exit !found } ' || shutdown -h now diff --git a/acpid.spec b/acpid.spec index bae67f5..639490d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-3 +- Added exception for plasmashell to power.sh + Related: rhbz#1319885 + * Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-2 - Added exception for kded5 to power.sh Resolves: rhbz#1319885 From b6040032e56b5334a5edbb634cf2a300c9ffa2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 3 Aug 2016 17:00:20 +0200 Subject: [PATCH 14/62] Fixed service autostart (if enabled) Resolves: rhbz#1363632 --- acpid.service | 1 + acpid.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/acpid.service b/acpid.service index e7d0987..56e2c55 100644 --- a/acpid.service +++ b/acpid.service @@ -10,3 +10,4 @@ ExecStart=/usr/sbin/acpid -f $OPTIONS [Install] Also=acpid.socket +WantedBy=multi-user.target diff --git a/acpid.spec b/acpid.spec index 639490d..5ff28b3 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Aug 3 2016 Jaroslav Škarvada - 2.0.27-4 +- Fixed service autostart (if enabled) + Resolves: rhbz#1363632 + * Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-3 - Added exception for plasmashell to power.sh Related: rhbz#1319885 From ce6e405603c27a6fa6cc11f0968d1e1049b580c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 16 Sep 2016 12:36:11 +0200 Subject: [PATCH 15/62] New version Resolves: rhbz#1376618 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 5ff28b3..fe89007 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.27 -Release: 4%{?dist} +Version: 2.0.28 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Fri Sep 16 2016 Jaroslav Škarvada - 2.0.28-1 +- New version + Resolves: rhbz#1376618 + * Wed Aug 3 2016 Jaroslav Škarvada - 2.0.27-4 - Fixed service autostart (if enabled) Resolves: rhbz#1363632 diff --git a/sources b/sources index c784f2c..1111511 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e41bdf628e122edb4342fca432ea7db9 acpid-2.0.27.tar.xz +0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz From b490262b76d5497f75b75dcac5f47f8dbbfa5bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Wed, 18 Jan 2017 16:36:30 +0100 Subject: [PATCH 16/62] Fixed obtaining process list in power.sh to avoid SELinux denials Resolves: rhbz#1408457 --- acpid.power.sh | 13 ++++++++++--- acpid.spec | 6 +++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/acpid.power.sh b/acpid.power.sh index db59f90..f1ef088 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -2,12 +2,19 @@ PATH=/usr/sbin:/usr/bin +# $1 = session number +function get_session_processes() { + local uid=$(loginctl show-session $1 | grep '^User=' | sed -r -e 's/^User=(.*)$/\1/') + systemd-cgls "/user.slice/user-${uid}.slice/session-${1}.scope" +} + # Check session status using systemd session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do - session_status=$(loginctl session-status ${session}) - echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + session_status=$(loginctl show-session ${session}) + session_processes="$(get_session_processes ${session})" + echo "${session_status}" | grep -e 'Active=yes' &> /dev/null && + echo "${session_processes}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|plasmashell\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit diff --git a/acpid.spec b/acpid.spec index fe89007..5cbe054 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jan 18 2017 Ondřej Lysoněk - 2.0.28-2 +- Fixed obtaining process list in power.sh to avoid SELinux denials + Resolves: rhbz#1408457 + * Fri Sep 16 2016 Jaroslav Škarvada - 2.0.28-1 - New version Resolves: rhbz#1376618 From a0067e585880ef3c4ed7e941fa40abebde50e49e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:43:47 +0000 Subject: [PATCH 17/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 5cbe054..cf34fa7 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Jan 18 2017 Ondřej Lysoněk - 2.0.28-2 - Fixed obtaining process list in power.sh to avoid SELinux denials Resolves: rhbz#1408457 From f903e46c7390f7795eea6310fbbce82a1a0d061f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:34:18 +0000 Subject: [PATCH 18/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index cf34fa7..1c1c242 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.28-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.0.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 069fd7bde61281aa7fca211a5729378d32404bfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:23:17 +0000 Subject: [PATCH 19/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 1c1c242..7506aaf 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,9 @@ fi %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.0.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.0.28-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 72d5fa1fe13bff6dedf91ae5bedb84bf8c22179f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 31 Aug 2017 13:48:39 +0200 Subject: [PATCH 20/62] Switched kacpimon to dynamic connections (increased max connections from 20 to 1024) Resolves: rhbz#1450980 Consolidated new line delimiters --- ...-2.0.28-kacpimon-dynamic-connections.patch | 131 ++++++++++++++++++ acpid.spec | 17 ++- 2 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 acpid-2.0.28-kacpimon-dynamic-connections.patch diff --git a/acpid-2.0.28-kacpimon-dynamic-connections.patch b/acpid-2.0.28-kacpimon-dynamic-connections.patch new file mode 100644 index 0000000..b17dcbc --- /dev/null +++ b/acpid-2.0.28-kacpimon-dynamic-connections.patch @@ -0,0 +1,131 @@ +diff --git a/kacpimon/connection_list.c b/kacpimon/connection_list.c +index 9b0b0a8..f228186 100644 +--- a/kacpimon/connection_list.c ++++ b/kacpimon/connection_list.c +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + #include "connection_list.h" + +@@ -30,9 +31,9 @@ + /*---------------------------------------------------------------*/ + /* private objects */ + +-#define MAX_CONNECTIONS 20 ++static int capacity = 0; + +-static struct connection connection_list[MAX_CONNECTIONS]; ++static struct connection *connection_list = NULL; + + static int nconnections = 0; + +@@ -51,9 +52,19 @@ add_connection(struct connection *p) + { + if (nconnections < 0) + return; +- if (nconnections >= MAX_CONNECTIONS) { +- printf("add_connection(): Too many connections.\n"); +- return; ++ ++ /* if the list is full, allocate more space */ ++ if (nconnections >= capacity) { ++ /* no more than 1024 */ ++ if (capacity > 1024) { ++ printf("add_connection(): Too many connections.\n"); ++ return; ++ } ++ ++ /* another 20 */ ++ capacity += 20; ++ connection_list = ++ realloc(connection_list, sizeof(struct connection) * capacity); + } + + if (nconnections == 0) +@@ -70,6 +81,30 @@ add_connection(struct connection *p) + + /*---------------------------------------------------------------*/ + ++void ++delete_all_connections(void) ++{ ++ int i = 0; ++ ++ /* For each connection */ ++ for (i = 0; i <= get_number_of_connections(); ++i) ++ { ++ struct connection *p; ++ ++ p = get_connection(i); ++ ++ /* If this connection is invalid, try the next. */ ++ if (p == 0) ++ continue; ++ ++ close(p -> fd); ++ } ++ free(connection_list); ++ connection_list = NULL; ++} ++ ++/*---------------------------------------------------------------*/ ++ + struct connection * + find_connection(int fd) + { +diff --git a/kacpimon/connection_list.h b/kacpimon/connection_list.h +index 1d037cf..a787637 100644 +--- a/kacpimon/connection_list.h ++++ b/kacpimon/connection_list.h +@@ -56,4 +56,7 @@ extern const fd_set *get_fdset(void); + /* get the highest fd that was added to the list */ + extern int get_highestfd(void); + ++/* delete all connections, closing the fds */ ++extern void delete_all_connections(void); ++ + #endif /* CONNECTION_LIST_H__ */ +diff --git a/kacpimon/kacpimon.c b/kacpimon/kacpimon.c +index 1ddb9aa..253d270 100644 +--- a/kacpimon/kacpimon.c ++++ b/kacpimon/kacpimon.c +@@ -164,27 +164,6 @@ static void monitor(void) + + // --------------------------------------------------------------- + +-static void close_all(void) +-{ +- int i = 0; +- +- /* For each connection */ +- for (i = 0; i <= get_number_of_connections(); ++i) +- { +- struct connection *p; +- +- p = get_connection(i); +- +- /* If this connection is invalid, try the next. */ +- if (p == 0) +- continue; +- +- close(p -> fd); +- } +-} +- +-// --------------------------------------------------------------- +- + int main(void) + { + printf("Kernel ACPI Event Monitor...\n"); +@@ -199,7 +178,7 @@ int main(void) + + printf("Closing files...\n"); + +- close_all(); ++ delete_all_connections(); + + printf("Goodbye\n"); + diff --git a/acpid.spec b/acpid.spec index 7506aaf..4582d0a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -19,6 +19,8 @@ Source4: acpid.power.sh Source5: acpid.service Source6: acpid.sysconfig Source7: acpid.socket +# https://sourceforge.net/p/acpid2/tickets/14/ +Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ @@ -28,7 +30,6 @@ Requires(preun): systemd Requires(postun): systemd Requires: systemd - %description acpid is a daemon that dispatches ACPI events to user-space programs. @@ -45,13 +46,12 @@ The acpid-sysvinit contains SysV initscript. %prep %setup -q - +%patch0 -p1 -b .kacpimon-dynamic-connections %build %configure make %{?_smp_mflags} CFLAGS="%{optflags} %{?harden}" - %install rm -rf %{buildroot} mkdir -p %{buildroot} @@ -74,11 +74,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif - %clean rm -rf %{buildroot} - %files %defattr(-,root,root) %doc %{_docdir}/%{name} @@ -133,8 +131,13 @@ fi /sbin/chkconfig --add acpid >/dev/null 2>&1 || : %endif - %changelog +* Thu Aug 31 2017 Jaroslav Škarvada - 2.0.28-6 +- Switched kacpimon to dynamic connections (increased max connections + from 20 to 1024) + Resolves: rhbz#1450980 +- Consolidated new line delimiters + * Wed Aug 02 2017 Fedora Release Engineering - 2.0.28-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 9ac9e398912889a2aaa849b65f5de031b499e5c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:49:44 +0000 Subject: [PATCH 21/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4582d0a..967d26d 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -132,6 +132,9 @@ fi %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.28-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 31 2017 Jaroslav Škarvada - 2.0.28-6 - Switched kacpimon to dynamic connections (increased max connections from 20 to 1024) From 256c4c128601017f1081634d8458e31c7c813179 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:00:54 +0100 Subject: [PATCH 22/62] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- acpid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 967d26d..8b20158 100644 --- a/acpid.spec +++ b/acpid.spec @@ -21,7 +21,6 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd From 1b45fb15f2af6a7124a5fb62042431bd656a2647 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:01:33 +0100 Subject: [PATCH 23/62] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- acpid.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 8b20158..3f0f2bb 100644 --- a/acpid.spec +++ b/acpid.spec @@ -73,9 +73,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc %{_docdir}/%{name} From 37a02914b2f8d57e518b89ad387a8a9cbbaf5104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Mon, 19 Feb 2018 14:30:36 +0100 Subject: [PATCH 24/62] Add gcc to BuildRequires --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 3f0f2bb..c30680a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.28 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -23,7 +23,7 @@ Source7: acpid.socket Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ -BuildRequires: systemd +BuildRequires: systemd, gcc Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -128,6 +128,9 @@ fi %endif %changelog +* Mon Feb 19 2018 Ondřej Lysoněk - 2.0.28-8 +- Add gcc to BuildRequires + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.28-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d2070d836db71fb80905ea91660e22a2c83258be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 19 Apr 2018 14:23:37 +0200 Subject: [PATCH 25/62] New version Resolves: rhbz#1568392 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index c30680a..dc97309 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.28 -Release: 8%{?dist} +Version: 2.0.29 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -128,6 +128,10 @@ fi %endif %changelog +* Thu Apr 19 2018 Jaroslav Škarvada - 2.0.29-1 +- New version + Resolves: rhbz#1568392 + * Mon Feb 19 2018 Ondřej Lysoněk - 2.0.28-8 - Add gcc to BuildRequires diff --git a/sources b/sources index 1111511..0ef9641 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz +SHA512 (acpid-2.0.29.tar.xz) = 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17 From f0ea4bd48a552f6126d2ce16a397e8c4fd51460c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:09:19 -0500 Subject: [PATCH 26/62] Remove needless use of %defattr --- acpid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index dc97309..5310ff2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -74,7 +74,6 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %endif %files -%defattr(-,root,root) %doc %{_docdir}/%{name} %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket From c53f57b00ca81d5baa03988196a67bbf73d64114 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:57:58 +0000 Subject: [PATCH 27/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 5310ff2..9749858 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.29 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,9 @@ fi %endif %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Apr 19 2018 Jaroslav Škarvada - 2.0.29-1 - New version Resolves: rhbz#1568392 From 6ed003a6ba0c22bd103f088522956b24585ce77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 19 Jul 2018 16:56:19 +0200 Subject: [PATCH 28/62] New version Resolves: rhbz#1602974 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index 9749858..ec83033 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.29 -Release: 2%{?dist} +Version: 2.0.30 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -127,6 +127,10 @@ fi %endif %changelog +* Thu Jul 19 2018 Jaroslav Škarvada - 2.0.30-1 +- New version + Resolves: rhbz#1602974 + * Thu Jul 12 2018 Fedora Release Engineering - 2.0.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 0ef9641..83b2a32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.29.tar.xz) = 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17 +SHA512 (acpid-2.0.30.tar.xz) = 6901e93cc626817b782e43976caf4b7f89e8c4275eb7e9d31aeeb967b5d5bbb6a2b4dcf71e72ba666e10343cdbdbe8528feee955af5ba14de8ec88ef61b29f96 From 5c1d578003d2b85c868bd305a3b335083c57108e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Nov 2018 11:51:29 +0100 Subject: [PATCH 29/62] Dropped sysvinit support --- acpid.init | 115 ----------------------------------------------------- acpid.spec | 32 ++------------- 2 files changed, 4 insertions(+), 143 deletions(-) delete mode 100755 acpid.init diff --git a/acpid.init b/acpid.init deleted file mode 100755 index 0ddab7a..0000000 --- a/acpid.init +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash -# -# /etc/rc.d/init.d/acpid -# -# Starts the acpi daemon -# -# chkconfig: 345 26 74 -# description: Listen and dispatch ACPI events from the kernel -# processname: acpid - -### BEGIN INIT INFO -# Provides: acpid -# Required-Start: $syslog $local_fs -# Required-Stop: $syslog $local_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop acpid -# Description: Listen and dispatch ACPI events from the kernel -### END INIT INFO - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/acpid - -RETVAL=0 - -# -# See how we were called. -# - -check() { - # Check that we're a privileged user - [ `id -u` = 0 ] || exit 4 - - # Check if acpid is executable - test -x /usr/sbin/acpid || exit 5 -} - -start() { - - check - - # Check if it is already running - if [ ! -f /var/lock/subsys/acpid ]; then - echo -n $"Starting acpi daemon: " - daemon /usr/sbin/acpid $OPTIONS - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid - echo - fi - return $RETVAL -} - -stop() { - - check - - echo -n $"Stopping acpi daemon: " - killproc /usr/sbin/acpid - RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/acpid - echo - return $RETVAL -} - - -restart() { - stop - start -} - -reload() { - - check - - trap "" SIGHUP - action $"Reloading acpi daemon:" killall -HUP acpid - RETVAL=$? - return $RETVAL -} - -case "$1" in -start) - start - ;; -stop) - stop - ;; -reload) - reload - ;; -force-reload) - echo "$0: Unimplemented feature." - RETVAL=3 - ;; -restart) - restart - ;; -condrestart) - if [ -f /var/lock/subsys/acpid ]; then - restart - fi - ;; -status) - status acpid - RETVAL=$? - ;; -*) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}" - RETVAL=2 -esac - -exit $RETVAL diff --git a/acpid.spec b/acpid.spec index ec83033..429f335 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,11 +8,10 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.30 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz -Source1: acpid.init Source2: acpid.video.conf Source3: acpid.power.conf Source4: acpid.power.sh @@ -32,17 +31,6 @@ Requires: systemd %description acpid is a daemon that dispatches ACPI events to user-space programs. -%if 0%{?fedora} < 23 -%package sysvinit -Summary: ACPI Event Daemon -Group: System Environment/Daemons -Requires: %{name} = %{version}-%{release} -Requires(preun): /sbin/service - -%description sysvinit -The acpid-sysvinit contains SysV initscript. -%endif - %prep %setup -q %patch0 -p1 -b .kacpimon-dynamic-connections @@ -68,11 +56,6 @@ install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh install -p -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid -%if 0%{?fedora} < 23 -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d -install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid -%endif - %files %doc %{_docdir}/%{name} %{_unitdir}/%{name}.service @@ -91,11 +74,6 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid %{_mandir}/man8/acpi_listen.8.gz %{_mandir}/man8/kacpimon.8.gz -%if 0%{?fedora} < 23 -%files sysvinit -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid -%endif - %pre if [ "$1" = "2" ]; then conflist=`ls %{_sysconfdir}/acpi/events/*.conf 2> /dev/null` @@ -121,12 +99,10 @@ fi /sbin/chkconfig --del acpid >/dev/null 2>&1 || : /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : -%if 0%{?fedora} < 23 -%triggerpostun -n %{name}-sysvinit -- %{name} < 2.0.10-2 - /sbin/chkconfig --add acpid >/dev/null 2>&1 || : -%endif - %changelog +* Thu Nov 15 2018 Jaroslav Škarvada - 2.0.30-2 +- Dropped sysvinit support + * Thu Jul 19 2018 Jaroslav Škarvada - 2.0.30-1 - New version Resolves: rhbz#1602974 From e19881df7a342bbb4e510ce65e28126897a268d6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 30/62] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- acpid.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 429f335..77ddfaf 100644 --- a/acpid.spec +++ b/acpid.spec @@ -10,7 +10,6 @@ Name: acpid Version: 2.0.30 Release: 2%{?dist} License: GPLv2+ -Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf Source3: acpid.power.conf From 79cdab6734028bcdf49309266693b13ba54bed26 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:55:24 +0000 Subject: [PATCH 31/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 77ddfaf..70e5161 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.30 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Nov 15 2018 Jaroslav Škarvada - 2.0.30-2 - Dropped sysvinit support From a17a13a4daff5e50f4d9cdce2162dd583e4e3575 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:30:39 +0000 Subject: [PATCH 32/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 70e5161..15a2069 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.30 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.0.30-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From efb293c090648c7600af2ae9b6fedc20b177e6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 20 Aug 2019 17:58:16 +0200 Subject: [PATCH 33/62] New version Resolves: rhbz#1742776 --- ... => acpid-2.0.32-kacpimon-dynamic-connections.patch | 2 +- acpid.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename acpid-2.0.28-kacpimon-dynamic-connections.patch => acpid-2.0.32-kacpimon-dynamic-connections.patch (99%) diff --git a/acpid-2.0.28-kacpimon-dynamic-connections.patch b/acpid-2.0.32-kacpimon-dynamic-connections.patch similarity index 99% rename from acpid-2.0.28-kacpimon-dynamic-connections.patch rename to acpid-2.0.32-kacpimon-dynamic-connections.patch index b17dcbc..2cd2a7c 100644 --- a/acpid-2.0.28-kacpimon-dynamic-connections.patch +++ b/acpid-2.0.32-kacpimon-dynamic-connections.patch @@ -14,7 +14,7 @@ index 9b0b0a8..f228186 100644 /*---------------------------------------------------------------*/ /* private objects */ --#define MAX_CONNECTIONS 20 +-#define MAX_CONNECTIONS 100 +static int capacity = 0; -static struct connection connection_list[MAX_CONNECTIONS]; diff --git a/acpid.spec b/acpid.spec index 15a2069..ddf45c4 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.30 -Release: 4%{?dist} +Version: 2.0.32 +Release: 1%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -18,7 +18,7 @@ Source5: acpid.service Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ -Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch +Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc @@ -99,6 +99,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Aug 20 2019 Jaroslav Škarvada - 2.0.32-1 +- New version + Resolves: rhbz#1742776 + * Wed Jul 24 2019 Fedora Release Engineering - 2.0.30-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 075dc864fbb205c963cce248a6e3fc567cf11c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 20 Aug 2019 17:59:00 +0200 Subject: [PATCH 34/62] Added sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 83b2a32..f098da6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.30.tar.xz) = 6901e93cc626817b782e43976caf4b7f89e8c4275eb7e9d31aeeb967b5d5bbb6a2b4dcf71e72ba666e10343cdbdbe8528feee955af5ba14de8ec88ef61b29f96 +SHA512 (acpid-2.0.32.tar.xz) = c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7 From cc2fe697f81347198c147cca721c27b78448adfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:10:34 +0000 Subject: [PATCH 35/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index ddf45c4..e91d866 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.32-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 20 2019 Jaroslav Škarvada - 2.0.32-1 - New version Resolves: rhbz#1742776 From ccc98ef2a6dfeefe95d2d857e572e5c410db86f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:42:51 +0000 Subject: [PATCH 36/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index e91d866..507e22a 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.32-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 552dd0cbd2bd00b3517cf43d59e358d0b4fe5bb1 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:44:48 +0000 Subject: [PATCH 37/62] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- acpid.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/acpid.spec b/acpid.spec index 507e22a..8edbe84 100644 --- a/acpid.spec +++ b/acpid.spec @@ -22,6 +22,7 @@ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc +BuildRequires: make Requires(post): systemd Requires(preun): systemd Requires(postun): systemd From 1ae2c03c1246e88c046641d069b8358a7129228b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:46:34 +0000 Subject: [PATCH 38/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 8edbe84..8cc6a10 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 2.0.32-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a573c3caf52c18143c0926c1e5a0b69db788b8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:14:12 +0100 Subject: [PATCH 39/62] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- acpid.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 8cc6a10..af3ad6e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0.32-5 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Jan 25 2021 Fedora Release Engineering - 2.0.32-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 2e4aabe2b80f12380d9d5e63ee59d610c5177382 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 1 Jul 2021 10:40:20 -0400 Subject: [PATCH 40/62] Use /run for acpid.socket path --- acpid.socket | 2 +- acpid.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.socket b/acpid.socket index d61cba2..2f2770a 100644 --- a/acpid.socket +++ b/acpid.socket @@ -3,7 +3,7 @@ Description=ACPID Listen Socket Documentation=man:acpid(8) [Socket] -ListenStream=/var/run/acpid.socket +ListenStream=/run/acpid.socket [Install] WantedBy=sockets.target diff --git a/acpid.spec b/acpid.spec index af3ad6e..a16e725 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Jul 01 2021 FeRD (Frank Dana) - 2.0.32-6 +- Updated socket path from /var/run => /run in acpid.socket + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.0.32-5 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 2031b55b58d17ef8eb8b35ac5723ccb6d9b21a84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:18:40 +0000 Subject: [PATCH 41/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 3483164c0a7c164e6740becfa871fe1f5ecb745b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:13:48 +0000 Subject: [PATCH 42/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index a16e725..f9977f2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.32 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.32-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 01 2021 FeRD (Frank Dana) - 2.0.32-6 - Updated socket path from /var/run => /run in acpid.socket From 20fe56fd611b84e82ff2620ce9248800c2955139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 5 Oct 2021 21:16:25 +0200 Subject: [PATCH 43/62] New version Resolves: rhbz#2004773 --- .gitignore | 2 +- acpid.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e484e16..8818959 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -acpid-*.tar.xz +/acpid-*.tar.xz diff --git a/acpid.spec b/acpid.spec index f9977f2..3550f63 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.32 -Release: 7%{?dist} +Version: 2.0.33 +Release: 1%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Oct 5 2021 Jaroslav Škarvada - 2.0.33-1 +- New version + Resolves: rhbz#2004773 + * Wed Jul 21 2021 Fedora Release Engineering - 2.0.32-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index f098da6..ebfff6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.32.tar.xz) = c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7 +SHA512 (acpid-2.0.33.tar.xz) = 491a58c62fcad44dc57cbd9294437fbc215c2ec99a030286601cd1956ea504e723e61b11b315983073d66aace1997bc40e6421475f6073298f60b8dcda2add75 From 26ac1b85064695551a9bd6f29e05cee93d4f08d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:53:53 +0000 Subject: [PATCH 44/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 3550f63..4ce9969 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.33 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Oct 5 2021 Jaroslav Škarvada - 2.0.33-1 - New version Resolves: rhbz#2004773 From b8fd36d6f693d859f987473fff5bad23a03344ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:24:35 +0000 Subject: [PATCH 45/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4ce9969..b56e5bf 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.33 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 2.0.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bee1f356ab645e9751dcbc361eeb73a3e6b486e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 24 Sep 2022 17:58:42 +0200 Subject: [PATCH 46/62] New version Resolves: rhbz#2127331 --- acpid.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/acpid.spec b/acpid.spec index b56e5bf..7352257 100644 --- a/acpid.spec +++ b/acpid.spec @@ -7,8 +7,8 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.33 -Release: 3%{?dist} +Version: 2.0.34 +Release: 1%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Sat Sep 24 2022 Jaroslav Škarvada - 2.0.34-1 +- New version + Resolves: rhbz#2127331 + * Wed Jul 20 2022 Fedora Release Engineering - 2.0.33-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index ebfff6d..7ca6fe8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (acpid-2.0.33.tar.xz) = 491a58c62fcad44dc57cbd9294437fbc215c2ec99a030286601cd1956ea504e723e61b11b315983073d66aace1997bc40e6421475f6073298f60b8dcda2add75 +SHA512 (acpid-2.0.34.tar.xz) = 2bf92295b55bb44fe83074b3e0c1ae639f63edaeea84b2184ae95b38852be40f380d5413110b8c0fcb2efc2ec01bf4764e1dcb97022fc724bebbfc35c0b63c81 From 041abd75fe7b3d0dc41bbd27b92784d74ca772f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:22:02 +0000 Subject: [PATCH 47/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 7352257..78068a2 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Sep 24 2022 Jaroslav Škarvada - 2.0.34-1 - New version Resolves: rhbz#2127331 From bb00419669d16d69942bb4885d994fd867cbf8f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:52:22 +0000 Subject: [PATCH 48/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 78068a2..7b51ebc 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.34-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 2.0.34-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From aa0b1dad7e4eca6ed38e5f64d76ca46af69e9403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 9 Aug 2023 16:34:25 +0200 Subject: [PATCH 49/62] Converted license to SPDX --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 7b51ebc..ebb1945 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,8 +8,8 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 3%{?dist} -License: GPLv2+ +Release: 4%{?dist} +License: GPL-2.0-or-later AND X11 Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf Source3: acpid.power.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-4 +- Converted license to SPDX + * Wed Jul 19 2023 Fedora Release Engineering - 2.0.34-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9af6a96e883b7cb6ddc40052c2a6420a61aea53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 9 Aug 2023 21:24:09 +0200 Subject: [PATCH 50/62] Fixed SPDX license MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index ebb1945..b265fc0 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,8 +8,8 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 4%{?dist} -License: GPL-2.0-or-later AND X11 +Release: 5%{?dist} +License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf Source3: acpid.power.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-5 +- SPDX license fix + * Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-4 - Converted license to SPDX From 480ff5d8c15c47d8ad85b991a92de8a3fc63e748 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:06:46 +0000 Subject: [PATCH 51/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index b265fc0..4b4b2ec 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.34-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Aug 9 2023 Jaroslav Škarvada - 2.0.34-5 - SPDX license fix From 568ad27a01c678f89652e44d92af9a750841abd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:37:38 +0000 Subject: [PATCH 52/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 4b4b2ec..b2edb2e 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.0.34-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0.34-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2d62398826887713f0d88dd414c665dda5684ec5 Mon Sep 17 00:00:00 2001 From: Songsong Zhang Date: Fri, 23 Feb 2024 02:43:43 +0000 Subject: [PATCH 53/62] Add riscv64 support --- acpid.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index b2edb2e..e9e2f96 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -19,7 +19,7 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch -ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 +ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc BuildRequires: make @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Fri Feb 23 2024 Songsong Zhang - 2.0.34-8 +- Add riscv64 support + * Mon Jan 22 2024 Fedora Release Engineering - 2.0.34-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 09111b9ad4dc00e4b94617900348f2643a79e44e Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 54/62] Eliminate use of obsolete %patchN syntax (#2283636) --- acpid.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index e9e2f96..1fb3364 100644 --- a/acpid.spec +++ b/acpid.spec @@ -33,7 +33,7 @@ acpid is a daemon that dispatches ACPI events to user-space programs. %prep %setup -q -%patch0 -p1 -b .kacpimon-dynamic-connections +%patch -P0 -p1 -b .kacpimon-dynamic-connections %build %configure From c41219a4ee38d442802a2f3e455f695ff3f4b790 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:33:54 +0000 Subject: [PATCH 55/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 1fb3364..7216002 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source2: acpid.video.conf @@ -100,6 +100,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.34-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Feb 23 2024 Songsong Zhang - 2.0.34-8 - Add riscv64 support From 6a191fb96da045c629224fc870b5821c2bf956c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Aug 2024 16:34:53 +0200 Subject: [PATCH 56/62] Dropped videoconf, obsolete for some time Resolves: rhbz#2296943 --- acpid.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/acpid.spec b/acpid.spec index 7216002..956daa5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,10 +8,9 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz -Source2: acpid.video.conf Source3: acpid.power.conf Source4: acpid.power.sh Source5: acpid.service @@ -50,7 +49,6 @@ mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/sysconfig chmod 755 %{buildroot}%{_sysconfdir}/acpi/events -install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/acpi/events/videoconf install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/acpi/events/powerconf install -p -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh install -p -m 644 %{SOURCE5} %{SOURCE7} %{buildroot}%{_unitdir} @@ -63,7 +61,6 @@ install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid %dir %{_sysconfdir}/acpi %dir %{_sysconfdir}/acpi/events %dir %{_sysconfdir}/acpi/actions -%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/videoconf %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/powerconf %config(noreplace) %attr(0755,root,root) %{_sysconfdir}/acpi/actions/power.sh %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/acpid @@ -100,6 +97,10 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Mon Aug 12 2024 Jaroslav Škarvada - 2.0.34-10 +- Dropped videoconf, obsolete for some time + Resolves: rhbz#2296943 + * Wed Jul 17 2024 Fedora Release Engineering - 2.0.34-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 35d568ec65a6350a59b5665fdc39ef30423772b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:32:27 +0000 Subject: [PATCH 57/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 956daa5..74215ba 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -97,6 +97,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.0.34-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Aug 12 2024 Jaroslav Škarvada - 2.0.34-10 - Dropped videoconf, obsolete for some time Resolves: rhbz#2296943 From 3dff637eb55226cf9b98b4958baaf3f746964a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 14 Apr 2025 19:38:43 +0200 Subject: [PATCH 58/62] Dropped exclusivearch, the package is still useless on POWER (no firmware support yet), but it is required by some dependency Resolves: rhbz#2355763 --- acpid.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/acpid.spec b/acpid.spec index 74215ba..c519b12 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -18,7 +18,6 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch -ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc BuildRequires: make @@ -97,6 +96,11 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Thu Apr 3 2025 Jaroslav Škarvada - 2.0.34-12 +- Dropped exclusivearch, the package is still useless on POWER (no firmware support + yet), but it is required by some dependency + Resolves: rhbz#2355763 + * Thu Jan 16 2025 Fedora Release Engineering - 2.0.34-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 682db2b5793dff66035db77263253caf36bed299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 15 Apr 2025 15:39:41 +0200 Subject: [PATCH 59/62] Used exclusiverch on RHEL --- acpid.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index c519b12..ce7f726 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -18,6 +18,9 @@ Source6: acpid.sysconfig Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch +%if 0%{?rhel} +ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 +%endif URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc BuildRequires: make @@ -96,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Tue Apr 15 2025 Jaroslav Škarvada - 2.0.34-13 +- Used exclusiverch on RHEL + * Thu Apr 3 2025 Jaroslav Škarvada - 2.0.34-12 - Dropped exclusivearch, the package is still useless on POWER (no firmware support yet), but it is required by some dependency From 5ad567f3c5129d565c8314d519ef2ca5ac395037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 15 Apr 2025 17:28:49 +0200 Subject: [PATCH 60/62] Updated RHEL/ELN exclusive arch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- acpid.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index ce7f726..f47d581 100644 --- a/acpid.spec +++ b/acpid.spec @@ -19,7 +19,7 @@ Source7: acpid.socket # https://sourceforge.net/p/acpid2/tickets/14/ Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch %if 0%{?rhel} -ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 riscv64 +ExclusiveArch: x86_64 aarch64 riscv64 %endif URL: http://sourceforge.net/projects/acpid2/ BuildRequires: systemd, gcc From e712fb55ba7452146bf44a45dc5d46adb6b8f3fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:44:07 +0000 Subject: [PATCH 61/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index f47d581..30545be 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.0.34-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Apr 15 2025 Jaroslav Škarvada - 2.0.34-13 - Used exclusiverch on RHEL From 133283cf38f93f2f6eb931247d18f0fc19ee4877 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:25:32 +0000 Subject: [PATCH 62/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- acpid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpid.spec b/acpid.spec index 30545be..6873b63 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.34 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-or-later Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz Source3: acpid.power.conf @@ -99,6 +99,9 @@ fi /bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.0.34-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.0.34-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild