Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package powerstat for openSUSE:Factory 
checked in at 2021-03-03 18:35:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/powerstat (Old)
 and      /work/SRC/openSUSE:Factory/.powerstat.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "powerstat"

Wed Mar  3 18:35:54 2021 rev:11 rq:876538 version:0.02.25

Changes:
--------
--- /work/SRC/openSUSE:Factory/powerstat/powerstat.changes      2020-08-24 
15:13:54.874710165 +0200
+++ /work/SRC/openSUSE:Factory/.powerstat.new.2378/powerstat.changes    
2021-03-03 18:36:06.275424052 +0100
@@ -1,0 +2,7 @@
+Mon Mar  1 08:30:06 UTC 2021 - Martin Hauke <[email protected]>
+
+- Update to version 0.02.25
+  * Remove deprecated siginterrupt call, replace with SA_RESTART
+    flag.
+
+-------------------------------------------------------------------

Old:
----
  powerstat-0.02.24.tar.gz

New:
----
  powerstat-0.02.25.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ powerstat.spec ++++++
--- /var/tmp/diff_new_pack.ClgjlA/_old  2021-03-03 18:36:06.667424333 +0100
+++ /var/tmp/diff_new_pack.ClgjlA/_new  2021-03-03 18:36:06.671424335 +0100
@@ -1,8 +1,8 @@
 #
 # spec file for package powerstat
 #
-# Copyright (c) 2020 SUSE LLC
-# Copyright (c) 2017, Martin Hauke <[email protected]>
+# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2017-2021, Martin Hauke <[email protected]>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 
 Name:           powerstat
-Version:        0.02.24
+Version:        0.02.25
 Release:        0
 Summary:        Laptop power measuring tool
 License:        GPL-2.0-only

++++++ powerstat-0.02.24.tar.gz -> powerstat-0.02.25.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/powerstat-0.02.24/Makefile 
new/powerstat-0.02.25/Makefile
--- old/powerstat-0.02.24/Makefile      2020-07-04 22:36:39.000000000 +0200
+++ new/powerstat-0.02.25/Makefile      2021-02-19 13:19:36.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2020 Canonical, Ltd.
+# Copyright (C) 2011-2021 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.24
+VERSION=0.02.25
 
 CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"'
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/powerstat-0.02.24/bash-completion/powerstat 
new/powerstat-0.02.25/bash-completion/powerstat
--- old/powerstat-0.02.24/bash-completion/powerstat     2020-07-04 
22:36:39.000000000 +0200
+++ new/powerstat-0.02.25/bash-completion/powerstat     2021-02-19 
13:19:36.000000000 +0100
@@ -1,6 +1,6 @@
 # powerstat tab completion for bash.
 #
-# Copyright (C) 2020 Canonical
+# Copyright (C) 2020-2021 Canonical
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/powerstat-0.02.24/powerstat.8 
new/powerstat-0.02.25/powerstat.8
--- old/powerstat-0.02.24/powerstat.8   2020-07-04 22:36:39.000000000 +0200
+++ new/powerstat-0.02.25/powerstat.8   2021-02-19 13:19:36.000000000 +0100
@@ -163,7 +163,7 @@
 This manual page was written by Colin King <[email protected]>,
 for the Ubuntu project (but may be used by others).
 .SH COPYRIGHT
-Copyright \(co 2011-2020 Canonical Ltd.
+Copyright \(co 2011-2021 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.24/powerstat.c 
new/powerstat-0.02.25/powerstat.c
--- old/powerstat-0.02.24/powerstat.c   2020-07-04 22:36:39.000000000 +0200
+++ new/powerstat-0.02.25/powerstat.c   2021-02-19 13:19:36.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2020 Canonical
+ * Copyright (C) 2011-2021 Canonical
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -3109,14 +3109,13 @@
        for (i = 0; i < (int)SIZEOF_ARRAY(signals); i++) {
                new_action.sa_handler = handle_sig;
                sigemptyset(&new_action.sa_mask);
-               new_action.sa_flags = 0;
+               new_action.sa_flags = SA_RESTART;
 
                if (sigaction(signals[i], &new_action, NULL) < 0) {
                        (void)fprintf(stderr, "sigaction failed: errno=%d 
(%s).\n",
                                errno, strerror(errno));
                        exit(EXIT_FAILURE);
                }
-               (void)siginterrupt(signals[i], 1);
        }
 
        log_init();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/powerstat-0.02.24/snap/snapcraft.yaml 
new/powerstat-0.02.25/snap/snapcraft.yaml
--- old/powerstat-0.02.24/snap/snapcraft.yaml   2020-07-04 22:36:39.000000000 
+0200
+++ new/powerstat-0.02.25/snap/snapcraft.yaml   2021-02-19 13:19:36.000000000 
+0100
@@ -1,17 +1,31 @@
 name: powerstat
-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
 type: app
 grade: stable
+assumes: [snapd2.45]
+base: core18
+adopt-info: powerstat
 
 parts:
     powerstat:
         plugin: make
         source: git://kernel.ubuntu.com/cking/powerstat
+        override-pull: |
+            snapcraftctl pull
+            description="$(git describe HEAD --tags)"
+            sha=$(echo $description | tr '-' ' ' | awk '{print $NF}')
+            version=${description%$sha}
+            commits=$(git log --oneline | wc -l)
+            date=$(date +'%Y%m%d')
+            if test "$description" = "$sha"
+            then
+                version="$description"
+            else
+                version=$(echo $version$date-$commits-$sha | cut -c1-32)
+            fi
+            snapcraftctl set-version "$version"
         build-packages:
             - gcc
             - make

Reply via email to