From 23ea678454deabeeecbb49bc39e6b9fa4ab8275d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:14:49 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for acpi --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From d67b5a1461113bba7d9fab3bbdc4e50a955cff91 Mon Sep 17 00:00:00 2001 From: "Steven M. Parrish" Date: Sat, 13 Jun 2009 22:14:59 +0000 Subject: [PATCH 2/5] New upstream release. Also drop obsolete patch --- .cvsignore | 2 +- acpi.spec | 19 +++++++++---------- sources | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e5b3ce..5bc7343 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpi-0.09.tar.gz +acpi-1.3.tar.gz diff --git a/acpi.spec b/acpi.spec index 86dd357..02c0882 100644 --- a/acpi.spec +++ b/acpi.spec @@ -1,16 +1,12 @@ Summary: Command-line ACPI client Summary(pl): Klient ACPI działający z linii poleceń Name: acpi -Version: 0.09 -Release: 5%{?dist} +Version: 1.3 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System -Source0: http://grahame.angrygoats.net/source/acpi/acpi-%{version}.tar.gz -Patch0: acpi-0.09-keep_CFLAGS.diff -## This URL does not seem to work anymore, but... -#URL: http://grahame.angrygoats.net/acpi.shtml -## ... it seems the project has renamed and moved to: -URL: http://sourceforge.net/projects/acpiclient/ +Source0: acpi-%{version}.tar.gz +URL: http://sourceforge.net/projects/acpiclient/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -25,7 +21,6 @@ opartych o ACPI. Zawiera informacje o zasilaniu i temperaturze. %prep %setup -q -%patch0 %build %configure @@ -43,8 +38,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog README COPYING %{_bindir}/acpi - +%{_datadir}/man/man1/acpi.1.gz %changelog +* Sat Jun 13 2009 Steven M. Parrish 1.3-1 +- New upstream release +- Removed obsolete patch + * Mon Feb 23 2009 Fedora Release Engineering - 0.09-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index bd6797f..e6618de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5a70595834b487c3a2f9278a3d60768 acpi-0.09.tar.gz +5851e5515e9d3b08160f64be0f8c1827 acpi-1.3.tar.gz From deac6bca28622fe61fab28547ac6c4b5adde393e Mon Sep 17 00:00:00 2001 From: "Steven M. Parrish" Date: Wed, 26 Aug 2009 17:24:59 +0000 Subject: [PATCH 3/5] fixed state information for thermal zones added output of all trip points straightlined old crufty user interface fixed battery output to cope with systems giving energy values but no voltage --- .cvsignore | 2 +- acpi.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5bc7343..52b8e53 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acpi-1.3.tar.gz +acpi-1.4.tar.gz diff --git a/acpi.spec b/acpi.spec index 02c0882..e10bca3 100644 --- a/acpi.spec +++ b/acpi.spec @@ -1,7 +1,7 @@ Summary: Command-line ACPI client Summary(pl): Klient ACPI działający z linii poleceń Name: acpi -Version: 1.3 +Version: 1.4 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -39,7 +39,14 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog README COPYING %{_bindir}/acpi %{_datadir}/man/man1/acpi.1.gz + %changelog +* Wed Aug 26 2009 Steven M. Parrish - 1.4-1 +- fixed state information for thermal zones +- added output of all trip points +- straightlined old crufty user interface +- fixed battery output to cope with systems giving energy values but no voltage + * Sat Jun 13 2009 Steven M. Parrish 1.3-1 - New upstream release - Removed obsolete patch diff --git a/sources b/sources index e6618de..13fac73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5851e5515e9d3b08160f64be0f8c1827 acpi-1.3.tar.gz +ea2a285957a36bad2ec099413bd330a5 acpi-1.4.tar.gz From 8f178aa0f7c733aefde52bbd9a6f5df70e35ad1d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:49 +0000 Subject: [PATCH 4/5] 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 5358c5f..a00b4db 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: acpi -# $Id$ +# $Id: Makefile,v 1.1 2006/03/17 21:43:22 pertusus Exp $ NAME := acpi 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 50b1cc39289e50d3ade67b8fb4f3a96e080b34c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:34:58 +0000 Subject: [PATCH 5/5] 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 a00b4db..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: acpi -# $Id: Makefile,v 1.1 2006/03/17 21:43:22 pertusus Exp $ -NAME := acpi -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11