Hello community,
here is the log from the commit of package powerstat for openSUSE:Factory
checked in at 2017-06-26 15:53:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/powerstat (Old)
and /work/SRC/openSUSE:Factory/.powerstat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerstat"
Mon Jun 26 15:53:16 2017 rev:2 rq:505861 version:0.02.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/powerstat/powerstat.changes 2017-05-17
23:54:35.822326937 +0200
+++ /work/SRC/openSUSE:Factory/.powerstat.new/powerstat.changes 2017-06-26
15:53:21.606381349 +0200
@@ -1,0 +2,14 @@
+Wed Jun 21 06:43:41 UTC 2017 - mar...@gmx.de
+
+- update to version 0.02.12
+ * Makefile: bump version
+ * Makefile: add snapcraft files to dist rule
+ * Fix incorrect GPU stats when sample rate is not 1 second (LP: #1699134)
+ * snapcraft: add default type and grade keys
+ * snapcraft: Makefile: remove icon hack
+ * reduce the scope of the variable 'buf'
+ * snapcraft.yaml: remove bogos unnecessary libs
+ * Add snapcraft files
+ * update copyright year
+
+-------------------------------------------------------------------
Old:
----
powerstat-0.02.11.tar.gz
New:
----
powerstat-0.02.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powerstat.spec ++++++
--- /var/tmp/diff_new_pack.34tfeD/_old 2017-06-26 15:53:22.242291679 +0200
+++ /var/tmp/diff_new_pack.34tfeD/_new 2017-06-26 15:53:22.242291679 +0200
@@ -1,6 +1,7 @@
#
# spec file for package powerstat
#
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017, Martin Hauke <mar...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -17,7 +18,7 @@
Name: powerstat
-Version: 0.02.11
+Version: 0.02.12
Release: 0
Summary: Laptop power measuring tool
License: GPL-2.0
++++++ powerstat-0.02.11.tar.gz -> powerstat-0.02.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.11/Makefile
new/powerstat-0.02.12/Makefile
--- old/powerstat-0.02.11/Makefile 2016-12-01 13:28:27.000000000 +0100
+++ new/powerstat-0.02.12/Makefile 2017-06-20 15:06:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2011-2016 Canonical, Ltd.
+# Copyright (C) 2011-2017 Canonical, Ltd.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
#
-VERSION=0.02.11
+VERSION=0.02.12
CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"'
@@ -42,7 +42,7 @@
dist:
rm -rf powerstat-$(VERSION)
mkdir powerstat-$(VERSION)
- cp -rp Makefile mascot powerstat.c powerstat.8 COPYING \
+ cp -rp Makefile mascot powerstat.c powerstat.8 COPYING snapcraft \
powerstat-$(VERSION)
tar -zcf powerstat-$(VERSION).tar.gz powerstat-$(VERSION)
rm -rf powerstat-$(VERSION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.11/powerstat.c
new/powerstat-0.02.12/powerstat.c
--- old/powerstat-0.02.11/powerstat.c 2016-12-01 13:28:27.000000000 +0100
+++ new/powerstat-0.02.12/powerstat.c 2017-06-20 15:06:38.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2016 Canonical
+ * Copyright (C) 2011-2017 Canonical
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1626,7 +1626,6 @@
static const char *rapl_get_domain(const int n)
{
int i;
- static char buf[128];
rapl_info_t *rapl = rapl_list;
@@ -1635,6 +1634,8 @@
}
if (rapl) {
if (rapl->is_package) {
+ static char buf[128];
+
snprintf(buf, sizeof(buf), "pkg-%s", rapl->domain_name
+ 8);
return buf;
}
@@ -1852,9 +1853,10 @@
res->inaccurate[POWER_GPU] = true;
ret = -1;
} else {
- s2->value[POWER_GPU] = (double)val / 1000000.0;
- res->value[POWER_GPU] = stats_sane(s1, s2, POWER_GPU);
+ s2->value[POWER_GPU] = ((double)val / 1000000.0) / sample_delay;
+ s2->inaccurate[POWER_GPU] = false;
res->inaccurate[POWER_GPU] = false;
+ res->value[POWER_GPU] = stats_sane(s1, s2, POWER_GPU);
ret = 0;
}
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.11/snapcraft/Makefile
new/powerstat-0.02.12/snapcraft/Makefile
--- old/powerstat-0.02.11/snapcraft/Makefile 1970-01-01 01:00:00.000000000
+0100
+++ new/powerstat-0.02.12/snapcraft/Makefile 2017-06-20 15:06:38.000000000
+0200
@@ -0,0 +1,18 @@
+VERSION=$(shell git tag | tail -1 | cut -c2-)
+COMMITS=$(shell git log --oneline | wc -l)
+SHA=$(shell git log -1 --oneline | cut -d' ' -f1)
+DATE=$(shell date +'%Y%m%d')
+V=$(VERSION)-$(DATE)-$(COMMITS)-$(SHA)
+
+all: set_version
+ snapcraft
+
+set_version:
+ cat snapcraft.yaml | sed 's/version: .*/version: $(V)/' >
snapcraft-tmp.yaml
+ mv snapcraft-tmp.yaml snapcraft.yaml
+
+clean:
+ rm -rf setup *.snap
+ snapcraft clean
+ cat snapcraft.yaml | sed 's/version: .*/version: 0/' >
snapcraft-tmp.yaml
+ mv snapcraft-tmp.yaml snapcraft.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/powerstat-0.02.11/snapcraft/snapcraft.yaml
new/powerstat-0.02.12/snapcraft/snapcraft.yaml
--- old/powerstat-0.02.11/snapcraft/snapcraft.yaml 1970-01-01
01:00:00.000000000 +0100
+++ new/powerstat-0.02.12/snapcraft/snapcraft.yaml 2017-06-20
15:06:38.000000000 +0200
@@ -0,0 +1,20 @@
+name: powerstat
+version: 0.02.11-20170425-290-5bd6c38
+summary: computer power measuring tool
+description: Powerstat measures the power consumption of a computer that has a
battery power source or an Intel RAPL power domain. The output is like vmstat
but also shows power consumption statistics. At the end of a run, powerstat
will calculate the average, standard deviation and min/max of the gathered data.
+confinement: devmode
+type: app
+grade: stable
+
+parts:
+ powerstat:
+ plugin: make
+ source: git://kernel.ubuntu.com/cking/powerstat
+ build-packages:
+ - gcc
+ - make
+
+apps:
+ powerstat:
+ command: usr/bin/powerstat
+
