[powertop] csstoh should return 0

Dan Horák sharkcz at fedoraproject.org
Wed Mar 23 15:15:35 UTC 2011


commit 43f05d1cee517236b9fb036c111b342ce2a6fb3e
Author: Dan Horák <dan at danny.cz>
Date:   Wed Mar 23 16:15:26 2011 +0100

    csstoh should return 0

 powertop-1.97-retval.patch |   11 +++++++++++
 powertop.spec              |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/powertop-1.97-retval.patch b/powertop-1.97-retval.patch
new file mode 100644
index 0000000..827acd5
--- /dev/null
+++ b/powertop-1.97-retval.patch
@@ -0,0 +1,11 @@
+diff -up powertop-1.97/csstoh.c.retval powertop-1.97/csstoh.c
+--- powertop-1.97/csstoh.c.retval	2011-03-23 15:58:35.000000000 +0100
++++ powertop-1.97/csstoh.c	2011-03-23 15:58:55.000000000 +0100
+@@ -65,4 +65,6 @@ int main(int argc, char **argv)
+ 	fprintf(out, "#endif\n");
+ 	fclose(out);
+ 	fclose(in);
++
++	return 0;
+ }
+\ No newline at end of file
diff --git a/powertop.spec b/powertop.spec
index f561ec3..9445c03 100644
--- a/powertop.spec
+++ b/powertop.spec
@@ -1,6 +1,6 @@
 Name:          powertop
 Version:       1.97
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Power consumption monitor
 
 Group:         Applications/System
@@ -8,6 +8,7 @@ License:       GPLv2
 URL:           http://www.lesswatts.org/
 #Source0:       http://www.lesswatts.org/projects/%{name}/download/%{name}-%{version}.tar.gz
 Source0:       http://www.kernel.org/pub/linux/status/powertop/%{name}-%{version}.tar.bz2
+Patch0:        %{name}-1.97-retval.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl-devel
 
@@ -17,6 +18,7 @@ computer use more power than necessary while it is idle.
 
 %prep
 %setup -q
+%patch0 -p1 -b .retval
 # nl.po is not yet ready and blocks the build process, so remove it.
 rm -f po/nl.po
 
@@ -42,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 #%{_mandir}/man8/powertop.8*
 
 %changelog
+* Wed Mar 23 2011 Dan Horák <dan[at]danny.cz> - 1.97-2
+- csstoh should return 0
+
 * Tue Feb 15 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.97-1
 - New version
 


More information about the scm-commits mailing list