Hello community, here is the log from the commit of package powerstat for openSUSE:Factory checked in at 2020-01-15 16:15:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerstat (Old) and /work/SRC/openSUSE:Factory/.powerstat.new.30080 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerstat" Wed Jan 15 16:15:04 2020 rev:7 rq:764447 version:0.02.21 Changes: -------- --- /work/SRC/openSUSE:Factory/powerstat/powerstat.changes 2018-07-25 16:13:12.205933717 +0200 +++ /work/SRC/openSUSE:Factory/.powerstat.new.30080/powerstat.changes 2020-01-15 16:45:55.005203980 +0100 @@ -1,0 +2,19 @@ +Mon Jan 13 22:00:30 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Update to version 0.02.21 + * No functional changes + +------------------------------------------------------------------- +Tue Aug 27 09:46:58 UTC 2019 - Martin Hauke <mar...@gmx.de> + +- Update to version 0.02.20 + * No functional changes + +------------------------------------------------------------------- +Sun Jul 7 18:41:19 UTC 2019 - Martin Hauke <mar...@gmx.de> + +- update to version 0.02.18 + * Update copyright year + * Make struct cpu_info pack more efficiently + +------------------------------------------------------------------- Old: ---- powerstat-0.02.18.tar.gz New: ---- powerstat-0.02.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerstat.spec ++++++ --- /var/tmp/diff_new_pack.9zlFHa/_old 2020-01-15 16:45:56.137204608 +0100 +++ /var/tmp/diff_new_pack.9zlFHa/_new 2020-01-15 16:45:56.169204626 +0100 @@ -1,7 +1,7 @@ # # spec file for package powerstat # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017, Martin Hauke <mar...@gmx.de> # # All modifications and additions to the file contributed by third parties @@ -13,12 +13,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: powerstat -Version: 0.02.18 +Version: 0.02.21 Release: 0 Summary: Laptop power measuring tool License: GPL-2.0-only ++++++ powerstat-0.02.18.tar.gz -> powerstat-0.02.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerstat-0.02.18/Makefile new/powerstat-0.02.21/Makefile --- old/powerstat-0.02.18/Makefile 2018-07-23 00:19:00.000000000 +0200 +++ new/powerstat-0.02.21/Makefile 2020-01-13 19:59:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2011-2018 Canonical, Ltd. +# Copyright (C) 2011-2020 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.18 +VERSION=0.02.21 CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerstat-0.02.18/powerstat.8 new/powerstat-0.02.21/powerstat.8 --- old/powerstat-0.02.18/powerstat.8 2018-07-23 00:19:00.000000000 +0200 +++ new/powerstat-0.02.21/powerstat.8 2020-01-13 19:59:45.000000000 +0100 @@ -163,7 +163,7 @@ This manual page was written by Colin King <colin.k...@canonical.com>, for the Ubuntu project (but may be used by others). .SH COPYRIGHT -Copyright \(co 2011-2018 Canonical Ltd. +Copyright \(co 2011-2020 Canonical Ltd. .br This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerstat-0.02.18/powerstat.c new/powerstat-0.02.21/powerstat.c --- old/powerstat-0.02.18/powerstat.c 2018-07-23 00:19:00.000000000 +0200 +++ new/powerstat-0.02.21/powerstat.c 2020-01-13 19:59:45.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2018 Canonical + * Copyright (C) 2011-2020 Canonical * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -134,7 +134,6 @@ typedef struct cpu_info { struct cpu_info *hash_next; /* Next in hash table */ struct cpu_info *list_next; /* Next in list of cpu_infos list */ - uint32_t cpu_id; /* CPU ID */ char *state; /* C-State sysfs name, e.g 'state2' */ cpu_state_t *cpu_state; /* C-State info */ double prev_tod; /* Previous Time-of-Day */ @@ -146,6 +145,7 @@ uint64_t prev_usage; /* Previous usage count */ uint64_t usage; /* Current usage count */ uint64_t usage_diff; /* Difference in usage count */ + uint32_t cpu_id; /* CPU ID */ } cpu_info_t; @@ -390,6 +390,7 @@ { FILE *fp; + *val = 0; if ((fp = fopen(file, "r")) == NULL) return -1; @@ -1764,6 +1765,7 @@ char *tmp; size_t new_len; + new_name[0] = '\0'; (void)snprintf(new_name, sizeof(new_name), "%s%s", len == 0 ? "" : ", ", rapl->domain_name); new_len = strlen(new_name); @@ -2574,6 +2576,8 @@ free(stats); return -1; } + s2 = s1; + if (opts & OPTS_CSTATES) cpu_states_update(); if (opts & OPTS_GPU) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerstat-0.02.18/snap/Makefile new/powerstat-0.02.21/snap/Makefile --- old/powerstat-0.02.18/snap/Makefile 2018-07-23 00:19:00.000000000 +0200 +++ new/powerstat-0.02.21/snap/Makefile 2020-01-13 19:59:45.000000000 +0100 @@ -1,18 +1,6 @@ -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 +all: 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.18/snap/snapcraft.yaml new/powerstat-0.02.21/snap/snapcraft.yaml --- old/powerstat-0.02.18/snap/snapcraft.yaml 2018-07-23 00:19:00.000000000 +0200 +++ new/powerstat-0.02.21/snap/snapcraft.yaml 2020-01-13 19:59:45.000000000 +0100 @@ -1,5 +1,7 @@ name: powerstat -version: 0.02.16-20180521-322-c35510c +version: git +version-script: | + echo $(git describe --tags) 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: strict
