From ae21a9daeffdba0510a12522ce2cb75b42bbc636 Mon Sep 17 00:00:00 2001 From: pertusus Date: Thu, 16 Feb 2006 20:50:40 +0000 Subject: [PATCH 01/63] - bump release - remove now unneeded patch --- .cvsignore | 2 +- acpitool-keep_CXXFLAGS.diff | 30 ------------------------------ acpitool.spec | 12 +++++++----- sources | 2 +- 4 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 acpitool-keep_CXXFLAGS.diff diff --git a/.cvsignore b/.cvsignore index 72e6abd..23dc0bd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.3.0.tar.gz +acpitool-0.4.4.tar.gz diff --git a/acpitool-keep_CXXFLAGS.diff b/acpitool-keep_CXXFLAGS.diff deleted file mode 100644 index 469b6e4..0000000 --- a/acpitool-keep_CXXFLAGS.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- acpitool-0.3.0-orig/configure 2005-10-22 15:10:09.000000000 +0200 -+++ acpitool-0.3.0/configure 2005-11-10 23:49:15.000000000 +0100 -@@ -3374,27 +3374,6 @@ - - - --CXXFLAGS="-O2 -Wall" -- -- --case ${host_cpu} in --*586) -- CXXFLAGS="${CXXFLAGS} -mcpu=i586 -march=i586" -- ;; --*686) -- CXXFLAGS="${CXXFLAGS} -mcpu=i686 -march=i686" -- ;; --x86-64) -- CXXFLAGS="${CXXFLAGS} -march=k8" -- ;; --*) -- ;; --esac -- --echo "$as_me:$LINENO: result: $CXXFLAGS" >&5 --echo "${ECHO_T}$CXXFLAGS" >&6 -- -- - # Checks for libraries. - - # Checks for header files. diff --git a/acpitool.spec b/acpitool.spec index 0e34ec5..f1f2b29 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,12 +1,11 @@ Name: acpitool -Version: 0.3.0 -Release: 3%{?dist} +Version: 0.4.4 +Release: 1%{?dist} Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz Summary: A command line ACPI client for Linux Group: Applications/Internet License: GPL -Patch: acpitool-keep_CXXFLAGS.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -19,8 +18,7 @@ to get/set acpi values. Hence, a computer running a Linux kernel from the 2.4.x or 2.6.x series with ACPI enabled is needed. %prep -%setup -%patch -p1 +%setup -q %build %configure @@ -40,6 +38,10 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Feb 16 2006 Patrice Dumas - 0.4.4-1 +- bump release +- remove now unneeded patch + * Thu Nov 10 2005 Patrice Dumas - 0.3.0-3 - add patch to avoid ignoring CXXFLAGS diff --git a/sources b/sources index bba6ba1..8f7aa1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f9fb795790e370e8e324fc7d4d4fe3f acpitool-0.3.0.tar.gz +7e487ac3118f316876e9b441dec4e3ad acpitool-0.4.4.tar.gz From 066ec69c659f92e05e79b968d21742452757b291 Mon Sep 17 00:00:00 2001 From: pertusus Date: Thu, 16 Feb 2006 20:55:04 +0000 Subject: [PATCH 02/63] correct changelog --- acpitool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index f1f2b29..6b0381e 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -39,7 +39,7 @@ rm -fr $RPM_BUILD_ROOT %changelog * Thu Feb 16 2006 Patrice Dumas - 0.4.4-1 -- bump release +- new version - remove now unneeded patch * Thu Nov 10 2005 Patrice Dumas - 0.3.0-3 From 647d87a7387757e094c2caecb187a2bdbae1331c Mon Sep 17 00:00:00 2001 From: pertusus Date: Thu, 16 Feb 2006 20:57:03 +0000 Subject: [PATCH 03/63] bump release to rebuild for modified changelog --- acpitool.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/acpitool.spec b/acpitool.spec index 6b0381e..a13057f 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,6 +1,6 @@ Name: acpitool Version: 0.4.4 -Release: 1%{?dist} +Release: 1%{?dist}.1 Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz Summary: A command line ACPI client for Linux @@ -38,7 +38,7 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog -* Thu Feb 16 2006 Patrice Dumas - 0.4.4-1 +* Thu Feb 16 2006 Patrice Dumas - 0.4.4-1.1 - new version - remove now unneeded patch From 2cca35f520fffa72630be482e1b359902c9ef3a0 Mon Sep 17 00:00:00 2001 From: pertusus Date: Sun, 21 May 2006 11:05:29 +0000 Subject: [PATCH 04/63] - update to 0.4.5 --- .cvsignore | 2 +- acpitool.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 23dc0bd..8f36d06 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.4.4.tar.gz +acpitool-0.4.5.tar.gz diff --git a/acpitool.spec b/acpitool.spec index a13057f..26b5bdb 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,6 +1,6 @@ Name: acpitool -Version: 0.4.4 -Release: 1%{?dist}.1 +Version: 0.4.5 +Release: 1%{?dist} Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz Summary: A command line ACPI client for Linux @@ -38,6 +38,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Feb 16 2006 Patrice Dumas - 0.4.5-1 +- update to 0.4.5 + * Thu Feb 16 2006 Patrice Dumas - 0.4.4-1.1 - new version - remove now unneeded patch @@ -51,4 +54,3 @@ rm -fr $RPM_BUILD_ROOT * Tue Aug 24 2004 Robert Ambrose - Created .spec file. - diff --git a/sources b/sources index 8f7aa1a..2665178 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e487ac3118f316876e9b441dec4e3ad acpitool-0.4.4.tar.gz +34647d800617cfa506c0db086c0d6195 acpitool-0.4.5.tar.gz From c279a62f19707a8f432cfb166e8c4e32a484efc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:14:00 +0000 Subject: [PATCH 05/63] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From cc4be434953306d4dada2d64075a3fae5767cc52 Mon Sep 17 00:00:00 2001 From: pertusus Date: Mon, 28 Aug 2006 09:38:48 +0000 Subject: [PATCH 06/63] - update to 0.4.6 --- .cvsignore | 2 +- acpitool.spec | 7 +++++-- needs.rebuild | 1 - sources | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 needs.rebuild diff --git a/.cvsignore b/.cvsignore index 8f36d06..6783866 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.4.5.tar.gz +acpitool-0.4.6.tar.gz diff --git a/acpitool.spec b/acpitool.spec index 26b5bdb..95fe08a 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,5 +1,5 @@ Name: acpitool -Version: 0.4.5 +Version: 0.4.6 Release: 1%{?dist} Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz @@ -38,7 +38,10 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog -* Thu Feb 16 2006 Patrice Dumas - 0.4.5-1 +* Mon Aug 28 2006 Patrice Dumas - 0.4.6-1 +- update to 0.4.6 + +* Sun May 21 2006 Patrice Dumas - 0.4.5-1 - update to 0.4.5 * Thu Feb 16 2006 Patrice Dumas - 0.4.4-1.1 diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/sources b/sources index 2665178..6934e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34647d800617cfa506c0db086c0d6195 acpitool-0.4.5.tar.gz +37d7a4eef8da04f015093d1e8b09ee10 acpitool-0.4.6.tar.gz From 026bcc72fab88e314798c640a652cae48f4d66ed Mon Sep 17 00:00:00 2001 From: pertusus Date: Fri, 6 Oct 2006 07:25:10 +0000 Subject: [PATCH 07/63] - set Group to Applications/System (fix #209230) --- acpitool.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/acpitool.spec b/acpitool.spec index 95fe08a..9d7d698 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,10 +1,10 @@ Name: acpitool Version: 0.4.6 -Release: 1%{?dist} +Release: 2%{?dist} Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz Summary: A command line ACPI client for Linux -Group: Applications/Internet +Group: Applications/System License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,20 +38,23 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog -* Mon Aug 28 2006 Patrice Dumas - 0.4.6-1 +* Fri Oct 6 2006 Patrice Dumas 0.4.6-2 +- set Group to Applications/System (fix #209230) + +* Mon Aug 28 2006 Patrice Dumas 0.4.6-1 - update to 0.4.6 -* Sun May 21 2006 Patrice Dumas - 0.4.5-1 +* Sun May 21 2006 Patrice Dumas 0.4.5-1 - update to 0.4.5 -* Thu Feb 16 2006 Patrice Dumas - 0.4.4-1.1 +* Thu Feb 16 2006 Patrice Dumas 0.4.4-1.1 - new version - remove now unneeded patch -* Thu Nov 10 2005 Patrice Dumas - 0.3.0-3 +* Thu Nov 10 2005 Patrice Dumas 0.3.0-3 - add patch to avoid ignoring CXXFLAGS -* Fri Nov 4 2005 Patrice Dumas - 0.3.0-2 +* Fri Nov 4 2005 Patrice Dumas 0.3.0-2 - update using fedora core conventions, some cleanings * Tue Aug 24 2004 Robert Ambrose From af84c874f3cbcd4e25e5750a4758b1c34a0538d7 Mon Sep 17 00:00:00 2001 From: pertusus Date: Thu, 24 May 2007 17:32:28 +0000 Subject: [PATCH 08/63] - update to 0.4.7 --- .cvsignore | 2 +- acpitool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6783866..b645c55 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.4.6.tar.gz +acpitool-0.4.7.tar.gz diff --git a/acpitool.spec b/acpitool.spec index 9d7d698..63f06be 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,6 +1,6 @@ Name: acpitool -Version: 0.4.6 -Release: 2%{?dist} +Version: 0.4.7 +Release: 1%{?dist} Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz Summary: A command line ACPI client for Linux @@ -38,6 +38,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu May 24 2007 Patrice Dumas 0.4.7-1 +- update to 0.4.7 + * Fri Oct 6 2006 Patrice Dumas 0.4.6-2 - set Group to Applications/System (fix #209230) diff --git a/sources b/sources index 6934e24..c175f78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37d7a4eef8da04f015093d1e8b09ee10 acpitool-0.4.6.tar.gz +7e2f5649f4cff5eace183ea9e68f5f20 acpitool-0.4.7.tar.gz From 0af13a8b70280b947c548e741ae2bbe4f1bd7486 Mon Sep 17 00:00:00 2001 From: pertusus Date: Sun, 18 Nov 2007 20:55:53 +0000 Subject: [PATCH 09/63] cosmetic spec file changes --- acpitool.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/acpitool.spec b/acpitool.spec index 63f06be..94c48b0 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,21 +1,21 @@ +Summary: Command line ACPI client Name: acpitool Version: 0.4.7 Release: 1%{?dist} -Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml -Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz -Summary: A command line ACPI client for Linux -Group: Applications/System License: GPL +Group: Applications/System +URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml + +Source: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -AcpiTool is a Linux ACPI client. It's a small command line application, -intended to be a replacement for the apm tool. The primary target -audience are laptop users, since these people are most interested in -things like battery status, thermal status and the ability to suspend -(sleep mode). The program simply accesses the /proc/acpi or /sysfs entries -to get/set acpi values. Hence, a computer running a Linux kernel from -the 2.4.x or 2.6.x series with ACPI enabled is needed. +AcpiTool is a Linux ACPI client. It's a small command line application, +intended to be a replacement for the apm tool. The primary target audience +are laptop users, since these people are most interested in things like +battery status, thermal status and the ability to suspend (sleep mode). +The program simply accesses the /proc/acpi or /sysfs entries to get or set +ACPI values. %prep %setup -q @@ -33,7 +33,7 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README TODO ChangeLog AUTHORS COPYING +%doc AUTHORS ChangeLog COPYING INSTALL README TODO %{_bindir}/acpitool %{_mandir}/man1/acpitool* From 8dedb5f0e6d3a7c1ecbed343183f9680ede303d1 Mon Sep 17 00:00:00 2001 From: pertusus Date: Mon, 17 Dec 2007 18:19:53 +0000 Subject: [PATCH 10/63] use .tar.bz2 --- .cvsignore | 2 +- acpitool.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b645c55..7733c3c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.4.7.tar.gz +acpitool-0.4.7.tar.bz2 diff --git a/acpitool.spec b/acpitool.spec index 94c48b0..2d6c225 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.4.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -38,7 +38,7 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog -* Thu May 24 2007 Patrice Dumas 0.4.7-1 +* Thu May 24 2007 Patrice Dumas 0.4.7-2 - update to 0.4.7 * Fri Oct 6 2006 Patrice Dumas 0.4.6-2 diff --git a/sources b/sources index c175f78..0a4423e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e2f5649f4cff5eace183ea9e68f5f20 acpitool-0.4.7.tar.gz +cba416a11229e896ec2639c59b6f59c5 acpitool-0.4.7.tar.bz2 From 96000d79f79ad93d7566489032cd36a713f54c6f Mon Sep 17 00:00:00 2001 From: pertusus Date: Thu, 3 Jan 2008 23:02:41 +0000 Subject: [PATCH 11/63] - fixes for gcc 4.3 --- acpitool-0.4.7-gcc43.patch | 303 +++++++++++++++++++++++++++++++++++++ acpitool.spec | 7 +- 2 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 acpitool-0.4.7-gcc43.patch diff --git a/acpitool-0.4.7-gcc43.patch b/acpitool-0.4.7-gcc43.patch new file mode 100644 index 0000000..698378a --- /dev/null +++ b/acpitool-0.4.7-gcc43.patch @@ -0,0 +1,303 @@ +diff -up acpitool-0.4.7/src/cpu.cpp.gcc43 acpitool-0.4.7/src/cpu.cpp +--- acpitool-0.4.7/src/cpu.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 ++++ acpitool-0.4.7/src/cpu.cpp 2008-01-03 23:55:44.000000000 +0100 +@@ -27,6 +27,8 @@ + #include + #endif + ++#include ++#include + #include + #include + #include +@@ -57,7 +59,7 @@ int Show_CPU_Info() + { + for(int t=0; t<4; t++) fgets(str, 299, cpuinfo_fp); // skip 4 lines // + fgets(str, 299, cpuinfo_fp); +- bzero(temp, 130); // use sscanf to extract what we need : // ++ memset(temp, '\0', 130); // use sscanf to extract what we need : // + sscanf(str, "%*[^:] %*s %[^\n]",temp); // ignore all up till :, then ignore the :, then use what's left // + printf(" CPU type : %s \n", temp); // till the newline char // + fgets(str, 299, cpuinfo_fp); +@@ -67,13 +69,13 @@ int Show_CPU_Info() + Show_Freq_Info(); // show freq scaling info if we have it // + else + { +- bzero(temp, 130); ++ memset(temp, '\0', 130); + sscanf(str, "%*[^:] %*s %s",temp); // ignore all up till :, then ignore the :, then use what's left // + printf(" CPU speed : %s MHz \n", temp); + } + + fgets(str, 299, cpuinfo_fp); +- bzero(temp, 130); ++ memset(temp, '\0', 130); + sscanf(str, "%*[^:] %*s %s",temp); + printf(" Cache size : %s KB\n", temp); + +@@ -82,7 +84,7 @@ int Show_CPU_Info() + while(!feof(cpuinfo_fp)) // Run loop until Bogomips line is found // + { // Need this generic aproach: the bogomips location is // + fgets(str, 299, cpuinfo_fp); // different for Amd64, Opteron, Core Duo, P4 with Ht, ... // +- bzero(temp, 130); ++ memset(temp, '\0', 130); + if(strncmp(str,"bogo",4)==0) + { + sscanf(str, "%*[^:] %*s %s",temp); +@@ -153,23 +155,23 @@ int Show_CPU_Info() + if(file_in) + { + file_in.getline(str, 90); // processor id +- bzero(temp, 130); ++ memset(temp, '\0', 130); + strncpy(temp, str+25, 5); + cout<<" Processor ID : "< + #endif + ++#include + #include + #include + #include +diff -up acpitool-0.4.7/src/toshiba.cpp.gcc43 acpitool-0.4.7/src/toshiba.cpp +--- acpitool-0.4.7/src/toshiba.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 ++++ acpitool-0.4.7/src/toshiba.cpp 2008-01-03 23:53:47.000000000 +0100 +@@ -28,6 +28,7 @@ + #include + #endif + ++#include + #include + #include + #include +diff -up acpitool-0.4.7/src/battery.cpp.gcc43 acpitool-0.4.7/src/battery.cpp +--- acpitool-0.4.7/src/battery.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 ++++ acpitool-0.4.7/src/battery.cpp 2008-01-03 23:58:28.000000000 +0100 +@@ -27,6 +27,8 @@ + #include + #endif + ++#include ++#include + #include + #include + #include +@@ -69,15 +71,15 @@ int Do_Battery_Stuff(int show_empty, int + Batt_Info[i] = new Battery_Info; + + Batt_Info[i]->Battery_Present = 0; +- bzero(Batt_Info[i]->Remaining_Cap, 10); +- bzero(Batt_Info[i]->Design_Cap, 10); +- bzero(Batt_Info[i]->LastFull_Cap, 10); +- bzero(Batt_Info[i]->Present_Rate, 10); +- bzero(Batt_Info[i]->Charging_State, 12); +- bzero(Batt_Info[i]->Technology, 13); +- bzero(Batt_Info[i]->Model, 13); +- bzero(Batt_Info[i]->Serial, 13); +- bzero(Batt_Info[i]->Bat_Type, 13); ++ memset(Batt_Info[i]->Remaining_Cap, '\0', 10); ++ memset(Batt_Info[i]->Design_Cap, '\0', 10); ++ memset(Batt_Info[i]->LastFull_Cap, '\0', 10); ++ memset(Batt_Info[i]->Present_Rate, '\0', 10); ++ memset(Batt_Info[i]->Charging_State, '\0', 12); ++ memset(Batt_Info[i]->Technology, '\0', 13); ++ memset(Batt_Info[i]->Model, '\0', 13); ++ memset(Batt_Info[i]->Serial, '\0', 13); ++ memset(Batt_Info[i]->Bat_Type, '\0', 13); + // initialize all struct members to blanks --> avoid rubbish in output // + + Get_Battery_Info(Bat_Nr, Batt_Info[i], verbose); +diff -up acpitool-0.4.7/src/thinkpad.cpp.gcc43 acpitool-0.4.7/src/thinkpad.cpp +--- acpitool-0.4.7/src/thinkpad.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 ++++ acpitool-0.4.7/src/thinkpad.cpp 2008-01-03 23:53:16.000000000 +0100 +@@ -1,5 +1,7 @@ + /* support for IBM Thinkpad acpi driver */ + ++#include ++#include + #include + #include + #include +diff -up acpitool-0.4.7/src/freq.cpp.gcc43 acpitool-0.4.7/src/freq.cpp +--- acpitool-0.4.7/src/freq.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 ++++ acpitool-0.4.7/src/freq.cpp 2008-01-03 23:57:22.000000000 +0100 +@@ -27,6 +27,8 @@ + #include + #endif + ++#include ++#include + #include + #include + #include +@@ -86,7 +88,7 @@ int Get_Min_Freq() + + if(freqinfo_fp) + { +- bzero(str, 300); ++ memset(str, '\0', 300); + fscanf(freqinfo_fp, "%s", str); + min_freq = atoi(str); + fclose(freqinfo_fp); +@@ -110,7 +112,7 @@ int Get_Max_Freq() + + if(freqinfo_fp) + { +- bzero(str, 300); ++ memset(str, '\0', 300); + fscanf(freqinfo_fp, "%s", str); + max_freq = atoi(str); + fclose(freqinfo_fp); +@@ -133,7 +135,7 @@ int Get_Current_Freq() + + if(freqinfo_fp) + { +- bzero(str, 300); ++ memset(str, '\0', 300); + fscanf(freqinfo_fp, "%s", str); + cur_freq = atoi(str); + fclose(freqinfo_fp); +@@ -155,7 +157,7 @@ int Get_Governor(char *c) + + if(freqinfo_fp) + { +- bzero(str, 300); ++ memset(str, '\0', 300); + fscanf(freqinfo_fp, "%s", str); + if (strlen(str)>0) + strcpy(c, str); +@@ -178,7 +180,7 @@ int Get_Driver(char *c) + + if(freqinfo_fp) + { +- bzero(str, 300); ++ memset(str, '\0', 300); + fscanf(freqinfo_fp, "%s", str); + if (strlen(str)>0) + strcpy(c, str); +diff -up acpitool-0.4.7/src/acpitool.cpp.gcc43 acpitool-0.4.7/src/acpitool.cpp +--- acpitool-0.4.7/src/acpitool.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 ++++ acpitool-0.4.7/src/acpitool.cpp 2008-01-03 23:52:34.000000000 +0100 +@@ -28,6 +28,8 @@ + #include + #endif + ++#include ++#include + #include + #include + #include +@@ -158,8 +160,8 @@ int Do_SysVersion_Info(int verbose) + { + char Acpi_Version[10], Kernel_Version[15]; + +- bzero(Acpi_Version, 10); +- bzero(Kernel_Version, 15); ++ memset(Acpi_Version, '\0', 10); ++ memset(Kernel_Version, '\0', 15); + + Get_Kernel_Version(Kernel_Version, verbose); + Get_ACPI_Version(Acpi_Version, verbose); +@@ -214,8 +216,8 @@ int Do_Thermal_Info(const int show_trip, + char *name; + char Temperature[5], State[5]; + +- bzero(Temperature, 5); +- bzero(State, 5); ++ memset(Temperature, '\0', 5); ++ memset(State, '\0', 5); + + dirname = "/proc/acpi/thermal_zone/"; + thermal_dir = opendir(dirname); +@@ -299,7 +301,7 @@ int Do_Thermal_Info(const int show_trip, + while(!feof(fp)) + { + /* fscanf(fp, "%s", str); */ +- bzero(str, 120); ++ memset(str, '\0', 120); + fgets(str, 120, fp); + if (strlen(str)!=0) + cout<<" "< 0.4.7-3 +- fixes for gcc 4.3 + * Thu May 24 2007 Patrice Dumas 0.4.7-2 - update to 0.4.7 From 363934a0a76e5b0defddc3f68ce54d1cc7967b2f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 17:56:44 +0000 Subject: [PATCH 12/63] - Autorebuild for GCC 4.3 --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 2b30486..c9ceb9d 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -40,6 +40,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.4.7-4 +- Autorebuild for GCC 4.3 + * Thu Jan 3 2008 Patrice Dumas 0.4.7-3 - fixes for gcc 4.3 From f50ed533bba9935810636ea6c547ace0e435c2ef Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 14 Jul 2008 17:12:23 +0000 Subject: [PATCH 13/63] fix license tag --- acpitool.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/acpitool.spec b/acpitool.spec index c9ceb9d..7893af1 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,8 +1,8 @@ Summary: Command line ACPI client Name: acpitool Version: 0.4.7 -Release: 4%{?dist} -License: GPL +Release: 5%{?dist} +License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -40,6 +40,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Mon Jul 14 2008 Tom "spot" Callaway - 0.4.7-5 +- fix license tag + * Tue Feb 19 2008 Fedora Release Engineering - 0.4.7-4 - Autorebuild for GCC 4.3 From 7d4fcb3f0bc6ea2ec7114dc7f1372430e59b5493 Mon Sep 17 00:00:00 2001 From: pertusus Date: Thu, 18 Sep 2008 15:01:23 +0000 Subject: [PATCH 14/63] - update to 0.5 --- .cvsignore | 2 +- acpitool-0.4.7-gcc43.patch | 303 ------------------------------------- acpitool-0.5-gcc43.patch | 34 +++++ acpitool.spec | 22 +-- sources | 2 +- 5 files changed, 49 insertions(+), 314 deletions(-) delete mode 100644 acpitool-0.4.7-gcc43.patch create mode 100644 acpitool-0.5-gcc43.patch diff --git a/.cvsignore b/.cvsignore index 7733c3c..35c55ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.4.7.tar.bz2 +acpitool-0.5.tar.bz2 diff --git a/acpitool-0.4.7-gcc43.patch b/acpitool-0.4.7-gcc43.patch deleted file mode 100644 index 698378a..0000000 --- a/acpitool-0.4.7-gcc43.patch +++ /dev/null @@ -1,303 +0,0 @@ -diff -up acpitool-0.4.7/src/cpu.cpp.gcc43 acpitool-0.4.7/src/cpu.cpp ---- acpitool-0.4.7/src/cpu.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 -+++ acpitool-0.4.7/src/cpu.cpp 2008-01-03 23:55:44.000000000 +0100 -@@ -27,6 +27,8 @@ - #include - #endif - -+#include -+#include - #include - #include - #include -@@ -57,7 +59,7 @@ int Show_CPU_Info() - { - for(int t=0; t<4; t++) fgets(str, 299, cpuinfo_fp); // skip 4 lines // - fgets(str, 299, cpuinfo_fp); -- bzero(temp, 130); // use sscanf to extract what we need : // -+ memset(temp, '\0', 130); // use sscanf to extract what we need : // - sscanf(str, "%*[^:] %*s %[^\n]",temp); // ignore all up till :, then ignore the :, then use what's left // - printf(" CPU type : %s \n", temp); // till the newline char // - fgets(str, 299, cpuinfo_fp); -@@ -67,13 +69,13 @@ int Show_CPU_Info() - Show_Freq_Info(); // show freq scaling info if we have it // - else - { -- bzero(temp, 130); -+ memset(temp, '\0', 130); - sscanf(str, "%*[^:] %*s %s",temp); // ignore all up till :, then ignore the :, then use what's left // - printf(" CPU speed : %s MHz \n", temp); - } - - fgets(str, 299, cpuinfo_fp); -- bzero(temp, 130); -+ memset(temp, '\0', 130); - sscanf(str, "%*[^:] %*s %s",temp); - printf(" Cache size : %s KB\n", temp); - -@@ -82,7 +84,7 @@ int Show_CPU_Info() - while(!feof(cpuinfo_fp)) // Run loop until Bogomips line is found // - { // Need this generic aproach: the bogomips location is // - fgets(str, 299, cpuinfo_fp); // different for Amd64, Opteron, Core Duo, P4 with Ht, ... // -- bzero(temp, 130); -+ memset(temp, '\0', 130); - if(strncmp(str,"bogo",4)==0) - { - sscanf(str, "%*[^:] %*s %s",temp); -@@ -153,23 +155,23 @@ int Show_CPU_Info() - if(file_in) - { - file_in.getline(str, 90); // processor id -- bzero(temp, 130); -+ memset(temp, '\0', 130); - strncpy(temp, str+25, 5); - cout<<" Processor ID : "< - #endif - -+#include - #include - #include - #include -diff -up acpitool-0.4.7/src/toshiba.cpp.gcc43 acpitool-0.4.7/src/toshiba.cpp ---- acpitool-0.4.7/src/toshiba.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 -+++ acpitool-0.4.7/src/toshiba.cpp 2008-01-03 23:53:47.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #endif - -+#include - #include - #include - #include -diff -up acpitool-0.4.7/src/battery.cpp.gcc43 acpitool-0.4.7/src/battery.cpp ---- acpitool-0.4.7/src/battery.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 -+++ acpitool-0.4.7/src/battery.cpp 2008-01-03 23:58:28.000000000 +0100 -@@ -27,6 +27,8 @@ - #include - #endif - -+#include -+#include - #include - #include - #include -@@ -69,15 +71,15 @@ int Do_Battery_Stuff(int show_empty, int - Batt_Info[i] = new Battery_Info; - - Batt_Info[i]->Battery_Present = 0; -- bzero(Batt_Info[i]->Remaining_Cap, 10); -- bzero(Batt_Info[i]->Design_Cap, 10); -- bzero(Batt_Info[i]->LastFull_Cap, 10); -- bzero(Batt_Info[i]->Present_Rate, 10); -- bzero(Batt_Info[i]->Charging_State, 12); -- bzero(Batt_Info[i]->Technology, 13); -- bzero(Batt_Info[i]->Model, 13); -- bzero(Batt_Info[i]->Serial, 13); -- bzero(Batt_Info[i]->Bat_Type, 13); -+ memset(Batt_Info[i]->Remaining_Cap, '\0', 10); -+ memset(Batt_Info[i]->Design_Cap, '\0', 10); -+ memset(Batt_Info[i]->LastFull_Cap, '\0', 10); -+ memset(Batt_Info[i]->Present_Rate, '\0', 10); -+ memset(Batt_Info[i]->Charging_State, '\0', 12); -+ memset(Batt_Info[i]->Technology, '\0', 13); -+ memset(Batt_Info[i]->Model, '\0', 13); -+ memset(Batt_Info[i]->Serial, '\0', 13); -+ memset(Batt_Info[i]->Bat_Type, '\0', 13); - // initialize all struct members to blanks --> avoid rubbish in output // - - Get_Battery_Info(Bat_Nr, Batt_Info[i], verbose); -diff -up acpitool-0.4.7/src/thinkpad.cpp.gcc43 acpitool-0.4.7/src/thinkpad.cpp ---- acpitool-0.4.7/src/thinkpad.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 -+++ acpitool-0.4.7/src/thinkpad.cpp 2008-01-03 23:53:16.000000000 +0100 -@@ -1,5 +1,7 @@ - /* support for IBM Thinkpad acpi driver */ - -+#include -+#include - #include - #include - #include -diff -up acpitool-0.4.7/src/freq.cpp.gcc43 acpitool-0.4.7/src/freq.cpp ---- acpitool-0.4.7/src/freq.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 -+++ acpitool-0.4.7/src/freq.cpp 2008-01-03 23:57:22.000000000 +0100 -@@ -27,6 +27,8 @@ - #include - #endif - -+#include -+#include - #include - #include - #include -@@ -86,7 +88,7 @@ int Get_Min_Freq() - - if(freqinfo_fp) - { -- bzero(str, 300); -+ memset(str, '\0', 300); - fscanf(freqinfo_fp, "%s", str); - min_freq = atoi(str); - fclose(freqinfo_fp); -@@ -110,7 +112,7 @@ int Get_Max_Freq() - - if(freqinfo_fp) - { -- bzero(str, 300); -+ memset(str, '\0', 300); - fscanf(freqinfo_fp, "%s", str); - max_freq = atoi(str); - fclose(freqinfo_fp); -@@ -133,7 +135,7 @@ int Get_Current_Freq() - - if(freqinfo_fp) - { -- bzero(str, 300); -+ memset(str, '\0', 300); - fscanf(freqinfo_fp, "%s", str); - cur_freq = atoi(str); - fclose(freqinfo_fp); -@@ -155,7 +157,7 @@ int Get_Governor(char *c) - - if(freqinfo_fp) - { -- bzero(str, 300); -+ memset(str, '\0', 300); - fscanf(freqinfo_fp, "%s", str); - if (strlen(str)>0) - strcpy(c, str); -@@ -178,7 +180,7 @@ int Get_Driver(char *c) - - if(freqinfo_fp) - { -- bzero(str, 300); -+ memset(str, '\0', 300); - fscanf(freqinfo_fp, "%s", str); - if (strlen(str)>0) - strcpy(c, str); -diff -up acpitool-0.4.7/src/acpitool.cpp.gcc43 acpitool-0.4.7/src/acpitool.cpp ---- acpitool-0.4.7/src/acpitool.cpp.gcc43 2008-01-03 23:49:10.000000000 +0100 -+++ acpitool-0.4.7/src/acpitool.cpp 2008-01-03 23:52:34.000000000 +0100 -@@ -28,6 +28,8 @@ - #include - #endif - -+#include -+#include - #include - #include - #include -@@ -158,8 +160,8 @@ int Do_SysVersion_Info(int verbose) - { - char Acpi_Version[10], Kernel_Version[15]; - -- bzero(Acpi_Version, 10); -- bzero(Kernel_Version, 15); -+ memset(Acpi_Version, '\0', 10); -+ memset(Kernel_Version, '\0', 15); - - Get_Kernel_Version(Kernel_Version, verbose); - Get_ACPI_Version(Acpi_Version, verbose); -@@ -214,8 +216,8 @@ int Do_Thermal_Info(const int show_trip, - char *name; - char Temperature[5], State[5]; - -- bzero(Temperature, 5); -- bzero(State, 5); -+ memset(Temperature, '\0', 5); -+ memset(State, '\0', 5); - - dirname = "/proc/acpi/thermal_zone/"; - thermal_dir = opendir(dirname); -@@ -299,7 +301,7 @@ int Do_Thermal_Info(const int show_trip, - while(!feof(fp)) - { - /* fscanf(fp, "%s", str); */ -- bzero(str, 120); -+ memset(str, '\0', 120); - fgets(str, 120, fp); - if (strlen(str)!=0) - cout<<" "< ++#include + #include + #include + #include +diff -up acpitool-0.5/src/toshiba.cpp.gcc43 acpitool-0.5/src/toshiba.cpp +--- acpitool-0.5/src/toshiba.cpp.gcc43 2007-11-06 22:19:59.000000000 +0100 ++++ acpitool-0.5/src/toshiba.cpp 2008-09-18 16:46:54.000000000 +0200 +@@ -29,6 +29,7 @@ + #endif + + #include ++#include + #include + #include + #include diff --git a/acpitool.spec b/acpitool.spec index 7893af1..eb1f364 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,22 +1,23 @@ Summary: Command line ACPI client Name: acpitool -Version: 0.4.7 -Release: 5%{?dist} +Version: 0.5 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml -Source: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2 -Patch0: acpitool-0.4.7-gcc43.patch +Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2 +Patch0: acpitool-0.5-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description AcpiTool is a Linux ACPI client. It's a small command line application, -intended to be a replacement for the apm tool. The primary target audience -are laptop users, since these people are most interested in things like -battery status, thermal status and the ability to suspend (sleep mode). -The program simply accesses the /proc/acpi or /sysfs entries to get or set -ACPI values. +intended to be a replacement for the apm tool. Besides "basic" ACPI +information like battery status, AC presence, putting the laptop to +sleep, Acpitool also supports various extensions for Toshiba, Asus and +IBM Thinkpad laptops, allowing you to change the LCD brightness level, +toggle fan on/off, and more. + %prep %setup -q @@ -40,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Sep 18 2008 Patrice Dumas 0.5-1 +- update to 0.5 + * Mon Jul 14 2008 Tom "spot" Callaway - 0.4.7-5 - fix license tag diff --git a/sources b/sources index 0a4423e..4e858e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cba416a11229e896ec2639c59b6f59c5 acpitool-0.4.7.tar.bz2 +c4acc19eb002d6871d12abb490593202 acpitool-0.5.tar.bz2 From 3f73641b1964e6fad27a7212c4f0e9588f9a0568 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 00:05:18 +0000 Subject: [PATCH 15/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index eb1f364..be736a6 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Sep 18 2008 Patrice Dumas 0.5-1 - update to 0.5 From c63692ad44320f9a8b204219f7a9519e6808f737 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:34:35 +0000 Subject: [PATCH 16/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index be736a6..1384328 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From ec82f400cd503c3ff474ec030846d80c15c83bba Mon Sep 17 00:00:00 2001 From: "Steven M. Parrish" Date: Wed, 26 Aug 2009 18:04:03 +0000 Subject: [PATCH 17/63] various minor fixes (fixing memleaks, removing of limit on thermal zones) --- .cvsignore | 2 +- acpitool.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 35c55ea..89374d5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.5.tar.bz2 +acpitool-0.5.1.tar.bz2 diff --git a/acpitool.spec b/acpitool.spec index 1384328..c991166 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,13 +1,13 @@ Summary: Command line ACPI client Name: acpitool -Version: 0.5 -Release: 3%{?dist} +Version: 0.5.1 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2 -Patch0: acpitool-0.5-gcc43.patch +#Patch0: acpitool-0.5-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -21,7 +21,7 @@ toggle fan on/off, and more. %prep %setup -q -%patch0 -p1 -b .gcc43 +#patch0 -p1 -b .gcc43 %build %configure @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Aug 26 2009 Steven M. Parrish 0.5.1-1 +- various minor fixes (fixing memleaks, removing of limit on thermal zones) + * Fri Jul 24 2009 Fedora Release Engineering - 0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 4e858e9..540c457 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4acc19eb002d6871d12abb490593202 acpitool-0.5.tar.bz2 +9e4ec55201be0be71ffbc56d38b42b57 acpitool-0.5.1.tar.bz2 From 70707a400ef4d91930411ab1b90adf6cb78afb00 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:24 +0000 Subject: [PATCH 18/63] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c619d2e..811922b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := acpitool SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1001aa7b453e4ffb8ee50adb2dc2477c52c205e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:35:22 +0000 Subject: [PATCH 19/63] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 811922b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: acpitool -# $Id$ -NAME := acpitool -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 5decee4a3c40e5cb602bad98260c15ec41a2e651 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:17:04 -0600 Subject: [PATCH 20/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index c991166..f8fea96 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Aug 26 2009 Steven M. Parrish 0.5.1-1 - various minor fixes (fixing memleaks, removing of limit on thermal zones) From 38296ee91250f377293362fdad26d6938c9df0a5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:00:06 -0600 Subject: [PATCH 21/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index f8fea96..51472ad 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f11ffdf722ed25cf788e9cd2634f3d3a6a3ed07f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 11:38:49 -0600 Subject: [PATCH 22/63] - Rebuilt for c++ ABI breakage --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 51472ad..de4ef56 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for c++ ABI breakage + * Thu Jan 12 2012 Fedora Release Engineering - 0.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 8f795411f7d528ff1e3ee0f729ebb2289b96aa25 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:33:35 -0500 Subject: [PATCH 23/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index de4ef56..14be235 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 0.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 28 2012 Fedora Release Engineering - 0.5.1-4 - Rebuilt for c++ ABI breakage From 7e7423565fe953047d5c835e2d4b18c86b7fb4a0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:15:41 -0600 Subject: [PATCH 24/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 14be235..d6a46c9 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 0.5.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From db3551e542792b069a025f52f6a6b1ba12f65a89 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:13:08 -0500 Subject: [PATCH 25/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index d6a46c9..9d35363 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 0.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 7c4384785ade8212de9b500362f78fbea6388a0f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:04:25 -0500 Subject: [PATCH 26/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 9d35363..99f84b6 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 0.5.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From e8a3099fd9541633e4b00eefafa57c4d5756dee2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 19:58:41 +0000 Subject: [PATCH 27/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 99f84b6..d7bdc78 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 0.5.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From b2c6e20d865b6d171409dbea5dbd6c36ffc5e81c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 11:36:14 +0200 Subject: [PATCH 28/63] Rebuilt for GCC 5 C++11 ABI change --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index d7bdc78..db804d3 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Sat May 02 2015 Kalev Lember - 0.5.1-10 +- Rebuilt for GCC 5 C++11 ABI change + * Fri Aug 15 2014 Fedora Release Engineering - 0.5.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 66359550ff2b4b5cf1136d4cd0a9bb5b884a598e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:35:47 +0000 Subject: [PATCH 29/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index db804d3..f6707fa 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 0.5.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 0.5.1-10 - Rebuilt for GCC 5 C++11 ABI change From 209419fafc47c179526c2a274809a7b411911e97 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:57:59 +0000 Subject: [PATCH 30/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index f6707fa..23d4a6b 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.5.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jun 16 2015 Fedora Release Engineering - 0.5.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9ee8c311a513421409dca9a03d74719a71fe0ae2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:43:53 +0000 Subject: [PATCH 31/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 23d4a6b..711e804 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 0.5.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a49cec32c2655984ba04fb734b2259f01608e95f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:34:25 +0000 Subject: [PATCH 32/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 711e804..dd817ec 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.5.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.5.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c19d38203cb57f008f92b8341ead3ec0ce63bee1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:23:25 +0000 Subject: [PATCH 33/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index dd817ec..cf2bbd8 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.5.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.5.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e514d84591e4a7104f379e253417056f2a4af467 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:49:53 +0000 Subject: [PATCH 34/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index cf2bbd8..46e9e87 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -41,6 +41,9 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.5.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 0.5.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 9fbaa32edb7d427b8ae4c7c0131ec656adc8f6b7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:00:56 +0100 Subject: [PATCH 35/63] 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 --- acpitool.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 46e9e87..0e11f7a 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -8,7 +8,6 @@ URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2 #Patch0: acpitool-0.5-gcc43.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description AcpiTool is a Linux ACPI client. It's a small command line application, From 6c2335c40ca6d92317d1e98b51e7b832e364ba16 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:29:37 +0100 Subject: [PATCH 36/63] 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 --- acpitool.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/acpitool.spec b/acpitool.spec index 0e11f7a..a37d795 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -30,9 +30,6 @@ make %{?_smp_mflags} rm -fr $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -%clean -rm -fr $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL README TODO From f0f7566c8201d3e95bc2b86dd84ad9fb02feacbd Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:09:23 -0500 Subject: [PATCH 37/63] Remove needless use of %defattr --- acpitool.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index a37d795..1fd5e40 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -31,7 +31,6 @@ rm -fr $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING INSTALL README TODO %{_bindir}/acpitool %{_mandir}/man1/acpitool* From a9f458f8ee82b11fb660ac6bc7f1e0af7495d772 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:58:04 +0000 Subject: [PATCH 38/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 1fd5e40..90c0437 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml @@ -36,6 +36,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.5.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.5.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0a14b68e60487952371bc041c7c193740f9e6201 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Mon, 23 Jul 2018 17:37:20 -0600 Subject: [PATCH 39/63] Added in BuildRequires for C++. Closes BZ1603341. Signed-off-by: Al Stone --- acpitool.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 90c0437..942af60 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,10 +1,11 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ Group: Applications/System URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml +BuildRequires: gcc-c++ Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2 #Patch0: acpitool-0.5-gcc43.patch @@ -36,6 +37,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Mon Jul 23 2018 Al Stone - 0.5.1-18 +- Add in BuildRequires for C++. Closes BZ1603341. + * Thu Jul 12 2018 Fedora Release Engineering - 0.5.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8cd89eeab098b5251401689fdef4094913f50f92 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Fri, 26 Oct 2018 15:11:23 -0600 Subject: [PATCH 40/63] Did a lot of cleanup and bug fixing, trying to make this viable Signed-off-by: Al Stone --- ac_adapter.patch | 73 ++++++ acpitool-0.5-gcc43.patch | 34 --- acpitool.spec | 30 ++- battery.patch | 484 +++++++++++++++++++++++++++++++++++++++ cleanup.patch | 371 ++++++++++++++++++++++++++++++ kernel3.patch | 12 + typos.patch | 29 +++ var-line.patch | 48 ++++ wakeup.patch | 70 ++++++ 9 files changed, 1112 insertions(+), 39 deletions(-) create mode 100644 ac_adapter.patch delete mode 100644 acpitool-0.5-gcc43.patch create mode 100644 battery.patch create mode 100644 cleanup.patch create mode 100644 kernel3.patch create mode 100644 typos.patch create mode 100644 var-line.patch create mode 100644 wakeup.patch diff --git a/ac_adapter.patch b/ac_adapter.patch new file mode 100644 index 0000000..156400b --- /dev/null +++ b/ac_adapter.patch @@ -0,0 +1,73 @@ +Author: Michael Meskes +Description: Fix reading of ac_adapter information. + +--- acpitool-0.5.1/src/ac_adapter.cpp 2009-08-13 21:26:02.000000000 +0200 ++++ acpitool-0.5.1.fixed/src/ac_adapter.cpp 2010-03-09 12:26:22.000000000 +0100 +@@ -149,7 +149,7 @@ + int Do_AC_Info_Sys() + { + ifstream file_in; +- char filename[2][65], str[100], temp[100]; ++ char filename[2][65], str[100], temp[100], attr[100]; + int ac_count = 0, start = 0, findex = 0; + DIR *ac_dir; + char *name, *dirname; +@@ -206,31 +206,40 @@ + + if(ac_count>0) + { +- for(int i=0; i 1, but you never know */ ++ for(int i=0, t=0; i 1, but you never know */ + { + FILE *power_fp = fopen(filename[i], "r"); + if(power_fp) + { +- for(int t=0; t<5; t++) +- fgets(str, 100, power_fp); /* just skip the first 5 lines */ +- +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); ++ // see linux-2.6/drivers/power/power_supply_sysfs.c ++ // there can be different number of lines, so read up to 40 lines ++ for(; t<40; t++) ++ { ++ memset(str, '\0', 100); ++ fgets(str, 100, power_fp); + +- if (strlen(str)!=0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); ++ if (strlen(str)!=0) ++ { ++ memset(temp, '\0', 100); ++ memset(attr, '\0', 100); ++ sscanf(str, "%[^=]s %*s %[^\n]", attr); ++ sscanf(str, "%*[^=] %*c %s %[^\n]",temp); + +- /* keep this for debugging */ +- /* printf(" from Do_AC_SYS: temp = %s \n", temp);*/ +- +- if(strncmp(temp,"1",1)==0) +- printf(" AC adapter : online \n"); +- else +- printf(" AC adapter : off-line \n"); ++ /* keep this for debugging */ ++ /* printf(" from Do_AC_SYS: temp = %s \n", temp);*/ ++ ++ if (strcmp(attr, "POWER_SUPPLY_ONLINE") == 0) ++ { ++ if(strncmp(temp,"1",1)==0) ++ printf(" AC adapter : online \n"); ++ else ++ printf(" AC adapter : off-line \n"); ++ ++ break; ++ } ++ } + } +- else ++ if (t == 40) + printf(" AC adapter : \n"); + } + else diff --git a/acpitool-0.5-gcc43.patch b/acpitool-0.5-gcc43.patch deleted file mode 100644 index 0a0ccd1..0000000 --- a/acpitool-0.5-gcc43.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up acpitool-0.5/src/cpu.cpp.gcc43 acpitool-0.5/src/cpu.cpp ---- acpitool-0.5/src/cpu.cpp.gcc43 2008-09-18 16:48:49.000000000 +0200 -+++ acpitool-0.5/src/cpu.cpp 2008-09-18 16:49:22.000000000 +0200 -@@ -69,7 +69,7 @@ int Show_CPU_Info() - Show_Freq_Info(); // show freq scaling info if we have it // - else - { -- bzero(temp, 130); -+ memset(temp, '\0', 130); - sscanf(str, "%*[^:] %*s %s",temp); // ignore all up till :, then ignore the :, then use what's left // - printf(" CPU speed : %s MHz \n", temp); - } -diff -up acpitool-0.5/src/freq.cpp.gcc43 acpitool-0.5/src/freq.cpp ---- acpitool-0.5/src/freq.cpp.gcc43 2008-07-21 00:47:55.000000000 +0200 -+++ acpitool-0.5/src/freq.cpp 2008-09-18 16:46:54.000000000 +0200 -@@ -28,6 +28,7 @@ - #endif - - #include -+#include - #include - #include - #include -diff -up acpitool-0.5/src/toshiba.cpp.gcc43 acpitool-0.5/src/toshiba.cpp ---- acpitool-0.5/src/toshiba.cpp.gcc43 2007-11-06 22:19:59.000000000 +0100 -+++ acpitool-0.5/src/toshiba.cpp 2008-09-18 16:46:54.000000000 +0200 -@@ -29,6 +29,7 @@ - #endif - - #include -+#include - #include - #include - #include diff --git a/acpitool.spec b/acpitool.spec index 942af60..a3a5e94 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,14 +1,20 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ Group: Applications/System -URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml +URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ -Source0: http://freeunix.dyndns.org:8088/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2 -#Patch0: acpitool-0.5-gcc43.patch +Source0: https://sourceforge.net/projects/acpitool/files/acpitool/%{version}/acpitool-%{version}.tar.bz2 +Patch0: ac_adapter.patch +Patch1: battery.patch +Patch2: kernel3.patch +Patch3: wakeup.patch +Patch4: var-line.patch +Patch5: typos.patch +Patch6: cleanup.patch %description AcpiTool is a Linux ACPI client. It's a small command line application, @@ -21,7 +27,13 @@ toggle fan on/off, and more. %prep %setup -q -#patch0 -p1 -b .gcc43 +%patch0 -p1 -b .ac_adapter +%patch1 -p1 -b .battery +%patch2 -p1 -b .kernel3 +%patch3 -p1 -b .wakeup +%patch4 -p1 -b .var-line +%patch5 -p1 -b .typos +%patch6 -p1 -b .cleanup %build %configure @@ -37,6 +49,14 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Fri Oct 26 2018 Al Stone - 0.5.1-19 +- Remove commented out acpitool-0.5-gcc43.patch; it's no longer needed and + just clutters up the spec file +- Merge in patches from Debian (Arch uses very similar but not exactly + identical nor as extensive patches). Closes BZ#1625002. +- Add a new patch to clean up g++ warning about implicit casts +- Fixed upstream to more recent location on sf.net + * Mon Jul 23 2018 Al Stone - 0.5.1-18 - Add in BuildRequires for C++. Closes BZ1603341. diff --git a/battery.patch b/battery.patch new file mode 100644 index 0000000..377502c --- /dev/null +++ b/battery.patch @@ -0,0 +1,484 @@ +Author: Evgeni Golov , Michael Meskes +Description: Fix reading of battery information. + +--- acpitool-0.5.1/src/acpitool.h 2008-10-16 17:38:12.000000000 +0200 ++++ acpitool-0.5.1.fixed/src/acpitool.h 2010-03-28 11:35:12.000000000 +0200 +@@ -39,6 +39,9 @@ + char Serial[13]; + char Bat_Type[13]; + char Voltage_Now[13]; ++ char Charge_Now[13]; ++ char Charge_Full[13]; ++ char Charge_Full_Design[13]; + }; + + +--- acpitool-0.5.1/src/battery.cpp 2009-08-13 21:42:43.000000000 +0200 ++++ acpitool-0.5.1.fixed/src/battery.cpp 2010-03-28 13:46:40.000000000 +0200 +@@ -107,6 +107,9 @@ + memset(Batt_Info[i]->Serial, '\0', 13); + memset(Batt_Info[i]->Bat_Type, '\0', 13); + memset(Batt_Info[i]->Voltage_Now, '\0', 13); ++ memset(Batt_Info[i]->Charge_Now, '\0', 13); ++ memset(Batt_Info[i]->Charge_Full, '\0', 13); ++ memset(Batt_Info[i]->Charge_Full_Design, '\0', 13); + + // initialize all struct members to blanks --> avoid rubbish in output // + +@@ -139,7 +142,12 @@ + case 1 : + { + Present_Batteries++; +- Remaining_Percentage = float(atoi(Batt_Info[i]->Remaining_Cap)) / float(atoi(Batt_Info[i]->LastFull_Cap)) * 100.0; ++ ++ if (strcmp(Batt_Info[i]->Charge_Now,"")!=0 && ++ strcmp(Batt_Info[i]->Charge_Now,"unknown")!=0) ++ Remaining_Percentage = float(atoi(Batt_Info[i]->Charge_Now)) / float(atoi(Batt_Info[i]->Charge_Full)) * 100.0; ++ else ++ Remaining_Percentage = float(atoi(Batt_Info[i]->Remaining_Cap)) / float(atoi(Batt_Info[i]->LastFull_Cap)) * 100.0; + + /* from Alan Pope : some broken Dell batteries report a remaining capacity bigger + than their last full capacity or their design capacity. This led acpitool to report +@@ -153,19 +161,24 @@ + else + Precision = 4; + +- if( strncmp(Batt_Info[i]->Charging_State,"char",4)==0 ) ++ if(strncasecmp(Batt_Info[i]->Charging_State,"char",4)==0) + { + Is_Charging = 1; + } + else + { +- if(strncmp(Batt_Info[i]->Charging_State,"disch",5)==0) Is_Discharging = 1; ++ if(strncasecmp(Batt_Info[i]->Charging_State,"disch",5)==0) Is_Discharging = 1; + } + + if(Show_Time) // calculate remaining or charging time only if present battery rate != 0 // + { +- if(Is_Charging) +- Remaining_Time = (float(atoi(Batt_Info[i]->LastFull_Cap)) - float(atoi(Batt_Info[i]->Remaining_Cap))) / float(atoi(Batt_Info[i]->Present_Rate)); ++ if(Is_Charging) { ++ if (strcmp(Batt_Info[i]->Charge_Now,"")!=0 && ++ strcmp(Batt_Info[i]->Charge_Now,"unknown")!=0) ++ Remaining_Time = (float(atoi(Batt_Info[i]->Charge_Full)) - float(atoi(Batt_Info[i]->Charge_Now))) / float(atoi(Batt_Info[i]->Present_Rate)); ++ else ++ Remaining_Time = (float(atoi(Batt_Info[i]->LastFull_Cap)) - float(atoi(Batt_Info[i]->Remaining_Cap))) / float(atoi(Batt_Info[i]->Present_Rate)); ++ } + else + Remaining_Time = float(atoi(Batt_Info[i]->Remaining_Cap)) / float(atoi(Batt_Info[i]->Present_Rate)); + // this represents hours // +@@ -180,9 +193,11 @@ + Minutes = Time_In_Seconds / 60; + Time_In_Seconds = Time_In_Seconds - (Minutes * 60); + } +- ++ + if(atoi(Batt_Info[i]->Design_Cap) > 0) + Battery_Left_Percent = float(atoi(Batt_Info[i]->LastFull_Cap)) / float(atoi(Batt_Info[i]->Design_Cap)) * 100.0; ++ else if(atoi(Batt_Info[i]->Charge_Full_Design) > 0) ++ Battery_Left_Percent = float(atoi(Batt_Info[i]->Charge_Full)) / float(atoi(Batt_Info[i]->Charge_Full_Design)) * 100.0; + else + Battery_Left_Percent = -1.0; + +@@ -207,8 +222,15 @@ + <Design_Cap<LastFull_Cap; ++ if(atoi(Batt_Info[i]->Design_Cap) > 0) ++ cout<<" Design capacity : "<Design_Cap<Charge_Full_Design) > 0) ++ cout<<" Design capacity : "<Charge_Full_Design<LastFull_Cap) > 0) ++ cout<<" Last full capacity : "<LastFull_Cap; ++ else if(atoi(Batt_Info[i]->Charge_Full) > 0) ++ cout<<" Last full capacity : "<Charge_Full; + + if(Battery_Left_Percent<100.0) + { +@@ -327,7 +349,7 @@ + + + +-int Get_Battery_Info_from_Proc(const int bat_nr, Battery_Info *bat_info, int verbose) ++int Get_Battery_Info_from_Proc(const int bat_nr, Battery_Info *batt_info, int verbose) + { + ifstream file_in; + char filename[4][65], str[100], temp[100]; +@@ -378,7 +400,7 @@ + { + if(!verbose) + { +- bat_info->Battery_Present = 2; // 2 represents error value // ++ batt_info->Battery_Present = 2; // 2 represents error value // + return 0; + } + else +@@ -422,24 +444,24 @@ + file_in.getline(str, 100); + strncpy(temp, str+25, 4); + if(strncmp(temp,"yes",3)==0) +- bat_info->Battery_Present = 1; //yes, we have a battery // ++ batt_info->Battery_Present = 1; //yes, we have a battery // + else + { +- bat_info->Battery_Present = 0; ++ batt_info->Battery_Present = 0; + return 0; //bail out if battery is not present // + } + + // then get the design capacity // + file_in.getline(str, 100); +- strncpy(bat_info->Design_Cap, str+25, 9); ++ strncpy(batt_info->Design_Cap, str+25, 9); + + // then get the last full capacity // + file_in.getline(str, 100); +- strncpy(bat_info->LastFull_Cap, str+25, 9); ++ strncpy(batt_info->LastFull_Cap, str+25, 9); + +- if (strncmp(bat_info->LastFull_Cap,"unknown",7)==0) ++ if (strncmp(batt_info->LastFull_Cap,"unknown",7)==0) + { +- bat_info->Battery_Present = 0; ++ batt_info->Battery_Present = 0; + return 0; //bail out if battery is not present // + } + /* some Dell laptops seem to report a 2nd battery as being present, while it is NOT, but then report the +@@ -449,21 +471,21 @@ + + // then get the technology // + file_in.getline(str, 100); +- strncpy(bat_info->Technology, str+25, 12); ++ strncpy(batt_info->Technology, str+25, 12); + + // then get the model number // + for(int t=0; t<5; t++) + file_in.getline(str, 100); //skip 5 lines // + file_in.getline(str, 100); +- strncpy(bat_info->Model, str+25, 12); ++ strncpy(batt_info->Model, str+25, 12); + + // then get the serial number // + file_in.getline(str, 100); +- strncpy(bat_info->Serial, str+25, 12); ++ strncpy(batt_info->Serial, str+25, 12); + + // then get the battery type // + file_in.getline(str, 100); +- strncpy(bat_info->Bat_Type, str+25, 12); ++ strncpy(batt_info->Bat_Type, str+25, 12); + + file_in.close(); + +@@ -480,17 +502,17 @@ + // then get the charging state // + file_in.getline(str, 100); file_in.getline(str, 100); // skip first 2 lines // + file_in.getline(str, 100); +- strncpy(bat_info->Charging_State, str+25, 12); +- if (strncmp(bat_info->Charging_State,"unknown",7)==0) strncpy(bat_info->Charging_State, "charged",7); ++ strncpy(batt_info->Charging_State, str+25, 12); ++ if (strncmp(batt_info->Charging_State,"unknown",7)==0) strncpy(batt_info->Charging_State, "charged",7); + /* on older kernels, like 2.4.22, the charging state is reported as "unknown", whereas in recent kernels + this was changed to "charged". */ + + // then get the charging rate // + file_in.getline(str, 100); +- strncpy(bat_info->Present_Rate, str+25, 9); +- if (strncmp(bat_info->Charging_State,"charged",7)==0) ++ strncpy(batt_info->Present_Rate, str+25, 9); ++ if (strncmp(batt_info->Charging_State,"charged",7)==0) + { +- if (strncmp(bat_info->Present_Rate, "unknown",7)==0) strncpy(bat_info->Present_Rate, "0 ",7); ++ if (strncmp(batt_info->Present_Rate, "unknown",7)==0) strncpy(batt_info->Present_Rate, "0 ",7); + } + /* some batteries report the present rate as "unknown", even when they report the battery as being charged. + If the battery is charged, the rate should be 0 */ +@@ -498,12 +520,12 @@ + + // then get the remaining capacity // + file_in.getline(str, 100); +- strncpy(bat_info->Remaining_Cap, str+25, 9); ++ strncpy(batt_info->Remaining_Cap, str+25, 9); + + file_in.close(); + } + else // battery dir is readable but empty : only . and .. at most // +- bat_info->Battery_Present = 3; ++ batt_info->Battery_Present = 3; + + return 0; + } +@@ -513,8 +535,8 @@ + int Get_Battery_Info_from_Sys(const int bat_nr, Battery_Info *batt_info, int verbose) + { + ifstream file_in; +- char filename[6][65], str[100], temp[100]; +- int bat_count = 0, start = 0, findex = 0; ++ char filename[6][65], str[100], temp[100], attr[100]; ++ int bat_count = 0, start = 0, findex = 0, value = 0; + DIR *battery_dir; + char *name, *dirname; + +@@ -613,165 +635,104 @@ + return -1; + } + +- memset(str, '\0', 100); +- for(int t=0; t<5; t++) +- fgets(str, 100, power_fp); /* skip first 5 lines */ +- +- /* get battery status (full, charging, ...) */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->Charging_State, temp, 12); +- } +- +- +- /* get battery presence (0 or 1) */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- strncpy(temp, str+21, 1); +- if(strncmp(temp,"1",1)==0) +- batt_info->Battery_Present = 1; /* yes, we have a battery */ +- else +- { +- batt_info->Battery_Present = 0; +- printf(" Battery is not present, bailing out. \n"); +- return 0; /* bail out if battery is not present */ +- } +- } +- +- +- /* get technology */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->Technology, temp, 12); +- } +- else +- strncpy(batt_info->Technology, "unknown", 7); +- +- +- +- //printf(" \n bat_info_tech = %s \n\n ", batt_info->Technology); +- +- +- +- fgets(str, 100, power_fp); /* skip 1 line */ +- +- +- /* get voltage_now */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->Voltage_Now, temp, 12); +- } +- else +- strncpy(batt_info->Voltage_Now, "unknown", 7); +- +- +- /* get current_now, which I believe is the charging rate ? */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->Present_Rate, temp, 12); +- } +- else +- strncpy(batt_info->Present_Rate, "unknown", 7); +- +- +- /* get charge_full_design */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->Design_Cap, temp, 12); +- } +- else +- strncpy(batt_info->Design_Cap, "unknown", 7); +- +- +- //printf(" \n bat_info_design_cap = %s \n ", batt_info->Design_Cap); +- +- +- /* get charge_full, which is the last full capacity I guess ? */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->LastFull_Cap, temp, 12); +- } +- else +- strncpy(batt_info->LastFull_Cap, "unknown", 7); +- +- +- //printf(" \n bat_info_lastfull_cap = %s \n\n ", batt_info->LastFull_Cap); +- +- +- /* get charge_now */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->Remaining_Cap, temp, 12); +- } +- else +- strncpy(batt_info->Remaining_Cap, "unknown", 7); +- +- //printf(" \n bat_info_remaining_cap = %s \n\n ", batt_info->Remaining_Cap); +- +- +- /* get model_name */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)>0) +- { +- memset(temp, '\0', 100); +- strncpy(temp, str+24, 12); // use strncpy here because sscanf chokes on blanks in this one ? // +- +- memset(str, '\0', 100); +- sscanf(temp, "%[^\n]", str); // strip trailing \n, fucks up output // +- +- strncpy(batt_info->Model, str, 12); ++ strncpy(batt_info->Technology, "unknown", 7); ++ strncpy(batt_info->Voltage_Now, "unknown", 7); ++ strncpy(batt_info->Charge_Now, "unknown", 7); ++ strncpy(batt_info->Charge_Full, "unknown", 7); ++ strncpy(batt_info->Charge_Full_Design, "unknown", 7); ++ strncpy(batt_info->Present_Rate, "unknown", 7); ++ strncpy(batt_info->Design_Cap, "unknown", 7); ++ strncpy(batt_info->LastFull_Cap, "unknown", 7); ++ strncpy(batt_info->Remaining_Cap, "unknown", 7); ++ strncpy(batt_info->Model, "unknown", 7); ++ strncpy(batt_info->Serial, "unknown", 7); ++ ++ // see linux-2.6/drivers/power/power_supply_sysfs.c ++ // there can be different number of lines, so read up to 40 lines ++ for(int t=0; t<40; t++) { ++ memset(str, '\0', 100); ++ memset(attr, '\0', 100); ++ memset(temp, '\0', 100); ++ fgets(str, 100, power_fp); ++ sscanf(str, "%[^=]s %*s %*[^\n]", attr); ++ sscanf(str, "%*[^=] %*c %s %*[^\n]",temp); ++ if (strcmp(attr,"POWER_SUPPLY_STATUS")==0) { ++ strncpy(batt_info->Charging_State, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_TYPE")==0) { ++ strncpy(batt_info->Bat_Type, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_TECHNOLOGY")==0) { ++ strncpy(batt_info->Technology, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_VOLTAGE_NOW")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i mV", value); ++ strncpy(batt_info->Voltage_Now, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_CURRENT_NOW")==0 || ++ strcmp(attr,"POWER_SUPPLY_POWER_NOW")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i", value); ++ strncpy(batt_info->Present_Rate, temp, 9); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_CHARGE_NOW")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i mA", value); ++ strncpy(batt_info->Charge_Now, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_CHARGE_FULL_DESIGN")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i mA", value); ++ strncpy(batt_info->Charge_Full_Design, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_CHARGE_FULL")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i mA", value); ++ strncpy(batt_info->Charge_Full, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_ENERGY_FULL_DESIGN")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i mWh", value); ++ strncpy(batt_info->Design_Cap, temp, 9); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_ENERGY_FULL")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i mWh", value); ++ strncpy(batt_info->LastFull_Cap, temp, 9); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_ENERGY_NOW")==0) { ++ value = atoi(temp) / 1000; ++ snprintf(temp, sizeof(temp), "%i mWh", value); ++ strncpy(batt_info->Remaining_Cap, temp, 9); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_MODEL_NAME")==0) { ++ strncpy(batt_info->Model, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_SERIAL_NUMBER")==0) { ++ strncpy(batt_info->Serial, temp, 12); ++ } ++ else if (strcmp(attr,"POWER_SUPPLY_PRESENT")==0) { ++ if(strncmp(temp,"1",1)==0) { ++ batt_info->Battery_Present = 1; ++ } ++ else { ++ batt_info->Battery_Present = 0; ++ printf(" Battery is not present, bailing out. \n"); ++ return 0; ++ } ++ } + } ++ if (strcmp(batt_info->Charge_Now,"")!=0 && ++ strcmp(batt_info->Charge_Now,"unknown")!=0) ++ snprintf(temp, sizeof(temp), "%s mA", batt_info->Present_Rate); + else +- strncpy(batt_info->Model, "unknown", 7); ++ snprintf(temp, sizeof(temp), "%s mW", batt_info->Present_Rate); + +- fgets(str, 100, power_fp); ++ strncpy(batt_info->Present_Rate, temp, 9); + +- /* get serial */ +- memset(str, '\0', 100); +- fgets(str, 100, power_fp); +- if (strlen(str)!=0) +- { +- memset(temp, '\0', 100); +- sscanf(str, "%*[^=] %*c %s %[^\n]",temp); +- strncpy(batt_info->Serial, temp, 12); +- } +- else +- strncpy(batt_info->Serial, "unknown", 7); +- + fclose(power_fp); +- } ++ } + else // battery dir is readable but empty : only . and .. at most // + batt_info->Battery_Present = 3; + return 0; diff --git a/cleanup.patch b/cleanup.patch new file mode 100644 index 0000000..3f231af --- /dev/null +++ b/cleanup.patch @@ -0,0 +1,371 @@ +Cleanup all of the warnings from implicit char const * casting + +ISO C++ used to allow: + + char *foo; + foo = "my string"; + +The standard has since changed, and this patch changes to the new +expectation: + + char const *foo; // which makes more sense + foo = "my string"; + +Signed-off-by: Al Stone + +diff -NaurEZbwB acpitool-0.5.1.orig/src/ac_adapter.cpp acpitool-0.5.1/src/ac_adapter.cpp +--- acpitool-0.5.1.orig/src/ac_adapter.cpp 2018-10-26 14:08:08.527714586 -0600 ++++ acpitool-0.5.1/src/ac_adapter.cpp 2018-10-26 14:24:33.819571023 -0600 +@@ -50,7 +50,8 @@ + int Do_AC_Info(int verbose) // wrapper around the other 2 functions // + { + ifstream file_in; +- char *dirname, filename[4][50], str[40]; ++ char const *dirname; ++ char filename[4][50], str[40]; + int ac_count = 0; + DIR *ac_dir; + struct dirent *ac_dirent; +@@ -87,7 +88,8 @@ + int Do_AC_Info_Proc(int verbose) + { + ifstream file_in; +- char *dirname, filename[4][50], str[40]; ++ char const *dirname; ++ char filename[4][50], str[40]; + int ac_count = 0; + DIR *ac_dir; + struct dirent *ac_dirent; +@@ -152,7 +154,7 @@ + char filename[2][65], str[100], temp[100], attr[100]; + int ac_count = 0, start = 0, findex = 0; + DIR *ac_dir; +- char *name, *dirname; ++ char const *name, *dirname; + + dirname = "/sys/class/power_supply/"; //find all entries in this dir + +diff -NaurEZbwB acpitool-0.5.1.orig/src/acpitool.cpp acpitool-0.5.1/src/acpitool.cpp +--- acpitool-0.5.1.orig/src/acpitool.cpp 2018-10-26 14:08:08.527714586 -0600 ++++ acpitool-0.5.1/src/acpitool.cpp 2018-10-26 14:23:21.903926202 -0600 +@@ -64,7 +64,8 @@ + int Has_ACPI(char *c) + { + ifstream file_in, file2_in; +- char *filename, *filename2, str[50]; ++ char const *filename, *filename2; ++ char str[50]; + + filename = "/proc/acpi/info"; + filename2 = "/sys/module/acpi/parameters/acpica_version"; +@@ -104,6 +105,7 @@ + return 1; + } + } ++ return 0; + } + + +@@ -137,7 +139,8 @@ + int Get_Kernel_Version(char *c, int verbose) + { + ifstream file_in; +- char *filename, str[20]; ++ char const *filename; ++ char str[20]; + + filename = "/proc/sys/kernel/osrelease"; + +@@ -185,7 +188,8 @@ + int Set_Kernel_Version() + { + ifstream file_in; +- char *filename, str[10]; ++ char const *filename; ++ char str[10]; + + filename = "/proc/sys/kernel/osrelease"; + +@@ -218,7 +222,8 @@ + int Do_Thermal_Info(const int show_trip, int verbose) + { + ifstream file_in, file_in2; +- char *dirname, str[120]; ++ char const *dirname; ++ char str[120]; + vector filename; + + DIR *thermal_dir; +@@ -341,7 +346,8 @@ + int Do_Fan_Info(int verbose) + { + ifstream file_in; +- char *dirname, filename[4][50], str[40]; ++ char const *dirname; ++ char filename[4][50], str[40]; + int fan_count = 0; + DIR *fan_dir; + struct dirent *fan_dirent; +@@ -416,7 +422,7 @@ + int Show_WakeUp_Devices(int verbose) + { + ifstream file_in; +- char *filename; ++ char const *filename; + string str; + + filename = "/proc/acpi/wakeup"; +@@ -461,7 +467,8 @@ + int Toggle_WakeUp_Device(const int Device, int verbose) + { + ofstream file_out; +- char *filename; string str; ++ char const *filename; ++ string str; + int index = 1; int charindex = 0; + std::vector Name(index); // Never is enough, use dynamic structures // + filename = "/proc/acpi/wakeup"; +@@ -527,7 +534,7 @@ + int Do_Suspend(int State) //put system in sleep state 3 or 4 (standby) // + { + ofstream file_out; +- char *filename, *str; ++ char const *filename, *str; + + Set_Kernel_Version(); + +diff -NaurEZbwB acpitool-0.5.1.orig/src/asus.cpp acpitool-0.5.1/src/asus.cpp +--- acpitool-0.5.1.orig/src/asus.cpp 2018-10-26 14:08:08.527714586 -0600 ++++ acpitool-0.5.1/src/asus.cpp 2018-10-26 14:28:37.753758221 -0600 +@@ -45,7 +45,7 @@ + int Has_Asus_ACPI() + { + ifstream file_in; +- char *filename; ++ char const *filename; + + filename = "/proc/acpi/asus"; + +@@ -82,7 +82,8 @@ + int Do_Asus_LCD_Info() + { + ifstream file_in; +- char *filename, lcdb[40]; ++ char const *filename; ++ char lcdb[40]; + + filename = "/proc/acpi/asus/brn"; + +@@ -116,7 +117,7 @@ + int Set_Asus_LCD_Level(int z) + { + ofstream file_out; +- char *filename; ++ char const *filename; + + filename = "/proc/acpi/asus/brn"; + +@@ -144,7 +145,7 @@ + int Do_Asus_Video_Info() + { + ifstream file_in; +- char *filename; ++ char const *filename; + int type; + filename = "/proc/acpi/asus/disp"; + +@@ -199,7 +200,8 @@ + int Do_Asus_Info() + { + ifstream file_in; +- char *filename, info[255]; ++ char const *filename; ++ char info[255]; + + filename = "/proc/acpi/asus/info"; + +@@ -264,7 +266,7 @@ + int Set_Asus_LCD_State(int o) + { + ofstream file_out; +- char *filename; ++ char const *filename; + filename = "/proc/acpi/asus/lcd"; + + file_out.open(filename); +@@ -289,7 +291,7 @@ + int Set_MLed(int state) + { + ofstream file_out; +- char *filename; ++ char const *filename; + filename = "/proc/acpi/asus/mled"; + + file_out.open(filename); +@@ -314,7 +316,7 @@ + int Set_WLed(int state) + { + ofstream file_out; +- char *filename; ++ char const *filename; + filename = "/proc/acpi/asus/wled"; + + file_out.open(filename); +diff -NaurEZbwB acpitool-0.5.1.orig/src/battery.cpp acpitool-0.5.1/src/battery.cpp +--- acpitool-0.5.1.orig/src/battery.cpp 2018-10-26 14:08:08.527714586 -0600 ++++ acpitool-0.5.1/src/battery.cpp 2018-10-26 14:34:12.828762620 -0600 +@@ -355,7 +355,8 @@ + char filename[4][65], str[100], temp[100]; + int bat_count = 0, start = 0, findex = 0; + DIR *battery_dir; +- char *name, *dirname; ++ char *name; ++ char const *dirname; + + dirname = "/proc/acpi/battery/"; //find all entries in this dir + // dirname = "/home/david/dropzone/data/devel/acpi/battery/"; // keep this for testing // +@@ -538,7 +539,8 @@ + char filename[6][65], str[100], temp[100], attr[100]; + int bat_count = 0, start = 0, findex = 0, value = 0; + DIR *battery_dir; +- char *name, *dirname; ++ char *name; ++ char const *dirname; + + dirname = "/sys/class/power_supply/"; //find all entries in this dir + +@@ -743,7 +745,8 @@ + int Count_Batteries_ProcFS() + { + DIR *battery_dir; +- char *name, *dirname; ++ char *name; ++ char const *dirname; + int t = 0; + + dirname = "/proc/acpi/battery/"; +@@ -789,7 +792,8 @@ + { + DIR *battery_dir; + char filename[4][65], str[100]; +- char *name, *dirname; ++ char *name; ++ char const *dirname; + int findex = 0, batcount = 0; + + /* Since kernel 2.6.24, the acpi interface is gradually being moved from /proc/acpi/... to the sys filesystem. */ +diff -NaurEZbwB acpitool-0.5.1.orig/src/cpu.cpp acpitool-0.5.1/src/cpu.cpp +--- acpitool-0.5.1.orig/src/cpu.cpp 2018-10-26 14:08:08.527714586 -0600 ++++ acpitool-0.5.1/src/cpu.cpp 2018-10-26 14:29:35.222273504 -0600 +@@ -48,7 +48,8 @@ + int Show_CPU_Info() + { + ifstream file_in, file2_in; +- char *dirname, filename[25][70], str[300], temp[130]; ++ char const *dirname; ++ char filename[25][70], str[300], temp[130]; + int cpu_count = 0, findex = 0, thrott = 0; + long int max_cstate = 0, cst_cnt = 0, cst_usage_abs[8], + cst_usage_notC0 = 0; +diff -NaurEZbwB acpitool-0.5.1.orig/src/thinkpad.cpp acpitool-0.5.1/src/thinkpad.cpp +--- acpitool-0.5.1.orig/src/thinkpad.cpp 2018-10-26 14:08:08.526714577 -0600 ++++ acpitool-0.5.1/src/thinkpad.cpp 2018-10-26 14:31:29.979302456 -0600 +@@ -12,7 +12,7 @@ + int Has_Thinkpad_ACPI() + { + ifstream file_in; +- char *filename; ++ char const *filename; + + filename = "/proc/acpi/ibm"; + +@@ -27,7 +27,7 @@ + int Eject_Thinkpad_Bay() + { + ofstream bay; +- char *filename; ++ char const *filename; + + if (!Has_Thinkpad_ACPI()) + { +@@ -54,7 +54,7 @@ + int Set_Thinkpad_LCD_Level(int z) + { + ofstream bright; +- char *filename; ++ char const *filename; + + filename = "/proc/acpi/ibm/brightness"; + +@@ -78,7 +78,8 @@ + int Do_Thinkpad_Fan_Info() + { + ifstream fan; +- char *filename, *status, *speed; ++ char const *filename; ++ char *status, *speed; + char line[32]; + int i; + +diff -NaurEZbwB acpitool-0.5.1.orig/src/toshiba.cpp acpitool-0.5.1/src/toshiba.cpp +--- acpitool-0.5.1.orig/src/toshiba.cpp 2018-10-26 14:08:08.526714577 -0600 ++++ acpitool-0.5.1/src/toshiba.cpp 2018-10-26 14:26:28.736601409 -0600 +@@ -45,7 +45,7 @@ + int Has_Toshiba_ACPI() + { + ifstream file_in; +- char *filename; ++ char const *filename; + + filename = "/proc/acpi/toshiba"; + +@@ -82,7 +82,8 @@ + int Do_Toshiba_Fan_Info() + { + ifstream file_in; +- char *filename, str[40]; ++ char const *filename; ++ char str[40]; + + filename = "/proc/acpi/toshiba/fan"; + +@@ -132,7 +133,8 @@ + int Do_LCD_Info() + { + ifstream file_in; +- char *filename, str[40]; ++ char const *filename; ++ char str[40]; + + filename = "/proc/acpi/toshiba/lcd"; + +@@ -166,7 +168,8 @@ + int Force_Fan(int s) + { + ofstream file_out; +- char *filename, str[15]; ++ char const *filename; ++ char str[15]; + + filename = "/proc/acpi/toshiba/fan"; + +@@ -200,7 +203,8 @@ + int Set_LCD_Level(int l) + { + ofstream file_out; +- char *filename, str[15]; ++ char const *filename; ++ char str[15]; + + filename = "/proc/acpi/toshiba/lcd"; + +@@ -230,7 +234,8 @@ + int Do_Video_Info() + { + ifstream file_in; +- char *filename, str[40]; ++ char const *filename; ++ char str[40]; + int lcd, crt; + + filename = "/proc/acpi/toshiba/video"; diff --git a/kernel3.patch b/kernel3.patch new file mode 100644 index 0000000..8fb592d --- /dev/null +++ b/kernel3.patch @@ -0,0 +1,12 @@ +--- acpitool-0.5.1/src/acpitool.cpp 2009-08-13 14:37:48.000000000 -0500 ++++ acpitool-0.5.1/src/acpitool.cpp 2011-07-28 08:40:37.000000000 -0500 +@@ -205,8 +205,7 @@ + Kernel_24 = 1; + Kernel_26 = 0; + } +- +- if(strncmp(str,"2.6",3)==0) ++ else + { + Kernel_24 = 0; + Kernel_26 = 1; diff --git a/typos.patch b/typos.patch new file mode 100644 index 0000000..3c974b9 --- /dev/null +++ b/typos.patch @@ -0,0 +1,29 @@ +--- acpitool/man/acpitool.1 2012-01-13 07:56:18.000000000 -0500 ++++ acpitool/man/acpitool.1 2012-08-10 00:07:25.646700871 -0400 +@@ -33,7 +33,7 @@ + .I /proc/acpi + or + .I /sys/class +-entries and presents the output in a meaningfull, human-readable format. ++entries and presents the output in a meaningful, human-readable format. + .br + + It provides a.o. information on battery status, AC adapter presence, thermal reading, etc. This command is +@@ -46,7 +46,7 @@ + + If your laptop is a + .B Toshiba +-, it allows you to set the LCD brighness level and toggle the fan on/off. ++, it allows you to set the LCD brightness level and toggle the fan on/off. + .br + + If you have an +@@ -98,7 +98,7 @@ + .B \-l x + Set LCD brightness level to x, where x is in the range 0..7. Works only on Toshiba and IBM Thinkpad laptops. + Requires write access to +-.I /proc/acpi/tochiba/lcd ++.I /proc/acpi/toshiba/lcd + or + .I /proc/acpi/ibm/brightness + . diff --git a/var-line.patch b/var-line.patch new file mode 100644 index 0000000..b3a790d --- /dev/null +++ b/var-line.patch @@ -0,0 +1,48 @@ +From 2f16822b9487a951ac898fd6703a7f8c7cd4ce06 Mon Sep 17 00:00:00 2001 +From: Guillem Jover +Date: Sat, 15 Nov 2014 11:59:37 +0100 +Subject: [PATCH] Do not assume fixed line lengths for /proc/acpi/wakeup file + +The lines in that file might be equal or longer than 40 characters, which +means that the getline() call will truncate them, possibly at the wrong +place, and then be unable to proceed, as subsequent calls will get stuck +waiting for input that is not coming. +--- + src/acpitool.cpp | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/acpitool.cpp b/src/acpitool.cpp +index f3beeca..e85a7c1 100644 +--- a/src/acpitool.cpp ++++ b/src/acpitool.cpp +@@ -416,7 +416,8 @@ int Do_Fan_Info(int verbose) + int Show_WakeUp_Devices(int verbose) + { + ifstream file_in; +- char *filename, str[40]; ++ char *filename; ++ string str; + + filename = "/proc/acpi/wakeup"; + +@@ -437,14 +438,14 @@ int Show_WakeUp_Devices(int verbose) + } + else + { +- file_in.getline(str, 40); // first line are just headers // ++ getline(file_in, str); // first line are just headers // + cout<<" "< +Date: Thu, 6 Oct 2011 03:12:55 +0200 +Subject: [PATCH] Use dynamic structures instead of predefined ones + + * The file /proc/acpi/wakeup can have much more than 25 entries. + In my computer (Dell E6420) I have 27 entries. + So instead of using an array of [x] entries better use dynamic + vectors and push the new entries when a new line from the file + is read. + + * The name of the device is not ever 4 characters. For example I + have a device called "LID" which is 3 characters long. + Instead of using a fixed size for the device we split the line + on the first tab (\t) and use the first part. +--- + src/acpitool.cpp | 23 +++++++++++------------ + 1 files changed, 11 insertions(+), 12 deletions(-) + +diff --git a/src/acpitool.cpp b/src/acpitool.cpp +index 2a610a5..71e01d7 100644 +--- a/src/acpitool.cpp ++++ b/src/acpitool.cpp +@@ -459,16 +459,14 @@ int Show_WakeUp_Devices(int verbose) + + int Toggle_WakeUp_Device(const int Device, int verbose) + { +- ifstream file_in; + ofstream file_out; +- char *filename, str[50]; +- int index = 1; +- char Name[25][5]; // 25 should be enough I guess, I have only 9 so far // +- ++ char *filename; string str; ++ int index = 1; int charindex = 0; ++ std::vector Name(index); // Never is enough, use dynamic structures // + filename = "/proc/acpi/wakeup"; + +- file_in.open(filename); +- if (!file_in) ++ ifstream file_in(filename, ifstream::in); ++ if (!file_in.good()) // if opening is not successful + { + if(!verbose) + { +@@ -483,14 +481,15 @@ int Toggle_WakeUp_Device(const int Device, int verbose) + } + } + +- file_in.getline(str, 50); // first line are just headers // ++ getline(file_in, str); // first line are just headers // + while(!file_in.eof()) // count all devices and store their names// + { +- file_in.getline(str, 50); +- if(strlen(str)!=0) // avoid empty last line // ++ getline(file_in, str); ++ if( str.length() != 0 ) // avoid empty last line // + { +- memset(Name[index], '\0', 5); +- strncpy(Name[index], str, 4); ++ charindex = 0; // reset to zero ++ while ( (str[++charindex]!='\t') ); // stop on first tab and get the array index ++ Name.push_back(str.substr(0,charindex)); // Push the name into the vector + index++; + } + } +-- +1.7.5.4 + + From ee834b82e2f28a849cb7e23644261d7dd2f04d9e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:38 +0100 Subject: [PATCH 41/63] Remove obsolete Group tag Signed-off-by: Igor Gnatenko --- acpitool.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index a3a5e94..8bf8805 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -3,7 +3,6 @@ Name: acpitool Version: 0.5.1 Release: 19%{?dist} License: GPLv2+ -Group: Applications/System URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ From 09d5b0651a364ef7c5a994848a2c05269bd4e996 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:55:33 +0000 Subject: [PATCH 42/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 8bf8805..8494fe9 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -48,6 +48,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.5.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Oct 26 2018 Al Stone - 0.5.1-19 - Remove commented out acpitool-0.5-gcc43.patch; it's no longer needed and just clutters up the spec file From 4d93de192753d3967aea44cb62ffdc1ad299d89f Mon Sep 17 00:00:00 2001 From: Al Stone Date: Tue, 28 May 2019 14:52:47 -0600 Subject: [PATCH 43/63] Cache size was reported incorrectly Incorporate patch provided in BZ Signed-off-by: Al Stone --- acpitool.spec | 9 ++++++++- cache-size.patch | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 cache-size.patch diff --git a/acpitool.spec b/acpitool.spec index 8494fe9..85a6b72 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -14,6 +14,7 @@ Patch3: wakeup.patch Patch4: var-line.patch Patch5: typos.patch Patch6: cleanup.patch +Patch7: cache-size.patch %description AcpiTool is a Linux ACPI client. It's a small command line application, @@ -33,6 +34,7 @@ toggle fan on/off, and more. %patch4 -p1 -b .var-line %patch5 -p1 -b .typos %patch6 -p1 -b .cleanup +%patch7 -p1 -b .cache-size %build %configure @@ -48,6 +50,11 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Tue May 28 2019 Al Stone - 0.5.1-21 +- Cache size was being reported incorrectly (cpufreq was being used + instead). Pulled in patch submitted with bug report once verified. + Closes BZ#1701278. + * Thu Jan 31 2019 Fedora Release Engineering - 0.5.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/cache-size.patch b/cache-size.patch new file mode 100644 index 0000000..cc811d6 --- /dev/null +++ b/cache-size.patch @@ -0,0 +1,15 @@ +Actually print the cache size instead of cpufreq a second time. + +Reported and fixed by Stephane Wirtel + +diff -rNu acpitool-0.5.1/src/cpu.cpp acpitool-0.5.1-modified/src/cpu.cpp +--- acpitool-0.5.1/src/cpu.cpp 2009-08-13 21:26:02.000000000 +0200 ++++ acpitool-0.5.1-modified/src/cpu.cpp 2019-04-18 16:01:54.091620544 +0200 +@@ -80,6 +80,7 @@ + } + + fgets(str, 299, cpuinfo_fp); ++ fgets(str, 299, cpuinfo_fp); + memset(temp, '\0', 130); + sscanf(str, "%*[^:] %*s %s",temp); + printf(" Cache size : %s KB\n", temp); From 6289c94414d201ac488a3be3ddb009b8fbe288e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:30:50 +0000 Subject: [PATCH 44/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 85a6b72..64ba139 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -50,6 +50,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.5.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue May 28 2019 Al Stone - 0.5.1-21 - Cache size was being reported incorrectly (cpufreq was being used instead). Pulled in patch submitted with bug report once verified. From 9206ee53fa79c99f97627871c8417fee4782cff5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:10:45 +0000 Subject: [PATCH 45/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 64ba139..ef29d96 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -50,6 +50,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.5.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 0.5.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 4130e7b6c69c1650d933c6975168167cf0275709 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:43:00 +0000 Subject: [PATCH 46/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index ef29d96..c5b2f40 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -50,6 +50,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.5.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 0.5.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d16214805ce2a7f2919f22ee16987f49d2906daa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:48:21 +0000 Subject: [PATCH 47/63] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index c5b2f40..dfd50dd 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -50,6 +50,10 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 0.5.1-25 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.5.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 205da264abc17e9f0e529ada5154626d473d92d2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:45:06 +0000 Subject: [PATCH 48/63] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- acpitool.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/acpitool.spec b/acpitool.spec index dfd50dd..a0ec9e6 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -5,6 +5,7 @@ Release: 25%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ +BuildRequires: make Source0: https://sourceforge.net/projects/acpitool/files/acpitool/%{version}/acpitool-%{version}.tar.bz2 Patch0: ac_adapter.patch From 0afad633c54e918e73d2cea70142de4424218261 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:46:43 +0000 Subject: [PATCH 49/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index a0ec9e6..3382ee7 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 0.5.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 0.5.1-25 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 419ab8b2218f2ce5a3dcea52e65f2788fb3cf889 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:18:48 +0000 Subject: [PATCH 50/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 805c5c1344d7b3ddc8400fb8d1c72367d1f7ce14 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:13:57 +0000 Subject: [PATCH 51/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 3382ee7..6bcfac2 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.5.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 0.5.1-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e8bc537ffb5eb4639313485d3020001b336ab843 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:54:02 +0000 Subject: [PATCH 52/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 6bcfac2..0753434 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 27%{?dist} +Release: 28%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.5.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.5.1-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6c568b29123b80b33439c9137cb460d62b54e76e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:24:45 +0000 Subject: [PATCH 53/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 0753434..e655593 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.5.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 0.5.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3e8f93fb1a99f435cfc8176211e4ed3d3e1b7d0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:22:11 +0000 Subject: [PATCH 54/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index e655593..4a28362 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 29%{?dist} +Release: 30%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.5.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 0.5.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fe84dd803ab0797b0e46e8f50215d8aff4c6a4e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:52:32 +0000 Subject: [PATCH 55/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 4a28362..6918f99 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 30%{?dist} +Release: 31%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.5.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0.5.1-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From fcb60b9af7dbb1127d5d2a0744ea8a80bb314ba6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:07:10 +0000 Subject: [PATCH 56/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 6918f99..6693063 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 31%{?dist} +Release: 32%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.5.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0.5.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 6b2226a1e11f4e5288db71a9357a6efd9798607c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:37:47 +0000 Subject: [PATCH 57/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 6693063..8a479c4 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.5.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.5.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eb5e9f80e9e6b40d439534acb92cb9625af20863 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 58/63] Eliminate use of obsolete %patchN syntax (#2283636) --- acpitool.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/acpitool.spec b/acpitool.spec index 8a479c4..25618ea 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -28,14 +28,14 @@ toggle fan on/off, and more. %prep %setup -q -%patch0 -p1 -b .ac_adapter -%patch1 -p1 -b .battery -%patch2 -p1 -b .kernel3 -%patch3 -p1 -b .wakeup -%patch4 -p1 -b .var-line -%patch5 -p1 -b .typos -%patch6 -p1 -b .cleanup -%patch7 -p1 -b .cache-size +%patch -P0 -p1 -b .ac_adapter +%patch -P1 -p1 -b .battery +%patch -P2 -p1 -b .kernel3 +%patch -P3 -p1 -b .wakeup +%patch -P4 -p1 -b .var-line +%patch -P5 -p1 -b .typos +%patch -P6 -p1 -b .cleanup +%patch -P7 -p1 -b .cache-size %build %configure From 4edc48bea7ba7644d4335b2d64e474bc6d753b3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:34:04 +0000 Subject: [PATCH 59/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 25618ea..5a07e17 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv2+ URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ @@ -51,6 +51,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.5.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.5.1-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5caa08a94bb055cd159b77be86bda8ed10a5e094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 22:52:58 +0200 Subject: [PATCH 60/63] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- acpitool.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/acpitool.spec b/acpitool.spec index 5a07e17..a4b9c30 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,8 +1,9 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 34%{?dist} -License: GPLv2+ +Release: 35%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://sourceforge.net/projects/acpitool/ BuildRequires: gcc-c++ BuildRequires: make @@ -51,6 +52,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Jul 25 2024 Miroslav Suchý - 0.5.1-35 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 0.5.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b70483d28675b42277a8b1f779aa79829a7ca02f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:32:38 +0000 Subject: [PATCH 61/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index a4b9c30..8f5ad35 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 35%{?dist} +Release: 36%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://sourceforge.net/projects/acpitool/ @@ -52,6 +52,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.5.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 0.5.1-35 - convert license to SPDX From 309c399a90e688e1cc64168678f255f8b40dd11e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:44:13 +0000 Subject: [PATCH 62/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 8f5ad35..296b255 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 36%{?dist} +Release: 37%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://sourceforge.net/projects/acpitool/ @@ -52,6 +52,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.5.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0.5.1-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ba553b4282e3feeee0a8636356ed6849447e80eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:25:37 +0000 Subject: [PATCH 63/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- acpitool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 296b255..7252c4b 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,7 +1,7 @@ Summary: Command line ACPI client Name: acpitool Version: 0.5.1 -Release: 37%{?dist} +Release: 38%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://sourceforge.net/projects/acpitool/ @@ -52,6 +52,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.5.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 0.5.1-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild