From 4a98db8973a94b4f868cb8c1bba2ad77c0c51f60 Mon Sep 17 00:00:00 2001 From: pertusus Date: Thu, 16 Feb 2006 21:25:10 +0000 Subject: [PATCH 1/7] - new version - 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..a13057f 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}.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 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.1 +- new version +- 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 e1eeced391e4572644460657a86e523edabc974b Mon Sep 17 00:00:00 2001 From: pertusus Date: Sun, 21 May 2006 14:18:16 +0000 Subject: [PATCH 2/7] - 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 b3f4e986f89a65c0a764a8818327d88dcd1a331a Mon Sep 17 00:00:00 2001 From: pertusus Date: Fri, 6 Oct 2006 07:25:08 +0000 Subject: [PATCH 3/7] - set Group to Applications/System (fix #209230) --- acpitool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acpitool.spec b/acpitool.spec index 26b5bdb..d682e79 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -38,7 +38,7 @@ rm -fr $RPM_BUILD_ROOT %{_mandir}/man1/acpitool* %changelog -* Thu Feb 16 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 From 21a525f3495848dcd6e45fb00b405d9e9fe1d63a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 4 Dec 2007 18:25:12 +0000 Subject: [PATCH 4/7] Initialize branch EL-4 for acpitool --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From bb62c824309c2623ddad3f396437f374cf048d6c Mon Sep 17 00:00:00 2001 From: pertusus Date: Mon, 17 Dec 2007 21:41:18 +0000 Subject: [PATCH 5/7] sync with devel --- .cvsignore | 2 +- acpitool.spec | 45 +++++++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8f36d06..7733c3c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpitool-0.4.5.tar.gz +acpitool-0.4.7.tar.bz2 diff --git a/acpitool.spec b/acpitool.spec index d682e79..2d6c225 100644 --- a/acpitool.spec +++ b/acpitool.spec @@ -1,21 +1,21 @@ +Summary: Command line ACPI client Name: acpitool -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 -Group: Applications/Internet +Version: 0.4.7 +Release: 2%{?dist} 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,22 +33,31 @@ 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* %changelog -* Sun May 21 2006 Patrice Dumas - 0.4.5-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 +- 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 - 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 diff --git a/sources b/sources index 2665178..0a4423e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34647d800617cfa506c0db086c0d6195 acpitool-0.4.5.tar.gz +cba416a11229e896ec2639c59b6f59c5 acpitool-0.4.7.tar.bz2 From fa38f8b1bd83233f339b606d24000d72a855cf7d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:52 +0000 Subject: [PATCH 6/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c619d2e..fd16972 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: acpitool -# $Id$ +# $Id: Makefile,v 1.1 2005/11/11 20:15:18 pertusus Exp $ 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 e9056cdd04d161ceae4b18c5af88cb47029d2adf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:35:19 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 fd16972..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: acpitool -# $Id: Makefile,v 1.1 2005/11/11 20:15:18 pertusus Exp $ -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) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4