commit hamster-time-tracker for openSUSE:Factory

21 Nov 2023

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package hamster-time-tracker for openSUSE:Factory checked in at 2023-11-21 21:31:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hamster-time-tracker (Old)
 and      /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hamster-time-tracker"

Tue Nov 21 21:31:44 2023 rev:10 rq:1127748 version:unknown

Changes:
--------
--- /work/SRC/openSUSE:Factory/hamster-time-tracker/hamster-time-tracker.changes	2023-09-29 21:15:06.525071387 +0200
+++ /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2521/hamster-time-tracker.changes	2023-11-21 21:32:08.311610550 +0100
@@ -1,0 +2,16 @@
+Mon Nov 20 11:33:04 UTC 2023 - mwilck@suse.com
+
+- Update to version 3.0.3
+- Changed fact entry syntax (see NEWS.md for details)
+  * Remove the need for using a double comma to start the description,
+    a single comma can be used instead.
+  * The tags part must now be separated by a comma. This allows using
+    '#' inside activityx, category and description
+  * extract simple #haswords from description, like
+    "fix #bugs in #hamster"
+  * consistent limitations on field content
+- spec file: fix build with python 3.6
+  * added remove-text-keyword-from-subprocess.run.patch
+  * refreshed replace-env-python-invocation-by-direct-call.patch
+
+-------------------------------------------------------------------

Old:
----
  hamster-time-tracker-3.0.3~20.tar.xz

New:
----
  hamster-time-tracker-3.0.3.tar.xz
  remove-text-keyword-from-subprocess.run.patch

BETA DEBUG BEGIN:
  New:- spec file: fix build with python 3.6
  * added remove-text-keyword-from-subprocess.run.patch
  * refreshed replace-env-python-invocation-by-direct-call.patch
BETA DEBUG END:

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

Other differences:
------------------
++++++ hamster-time-tracker.spec ++++++
--- /var/tmp/diff_new_pack.Ywdwlk/_old	2023-11-21 21:32:09.815666060 +0100
+++ /var/tmp/diff_new_pack.Ywdwlk/_new	2023-11-21 21:32:09.815666060 +0100
@@ -42,7 +42,7 @@
 %bcond_without extension
 
 Name:           hamster-time-tracker
-Version:        3.0.3~20
+Version:        3.0.3
 Release:        0
 Summary:        A time tracker for GNOME
 License:        CC-BY-SA-3.0 AND GPL-3.0-or-later
@@ -53,9 +53,9 @@
 Source1:        hamster-shell-extension-%{ext_version}.tar.gz
 # necessary for GNOME < 3.32
 Source2:        https://gitlab.gnome.org/GNOME/gnome-shell-extensions/raw/gnome-3-30/lib/con...
-# avoid rpm error: env-script-interpreter
 Patch1:         replace-env-python-invocation-by-direct-call.patch
 Patch2:         waf-skip-gsettings-schema-compilation.patch
+Patch3:         remove-text-keyword-from-subprocess.run.patch
 # Patches for GNOME extension
 # GNOME up to 3.30
 Patch101:       0101-Don-t-try-to-access-controller.activities-before-it-.patch
@@ -192,8 +192,13 @@
 
 %prep
 %setup -q -n hamster-time-tracker-%{version} -a1
+
 %patch1 -p1
 %patch2 -p1
+%if 0%{?suse_version} < 1550
+%patch3 -p1
+%endif
+
 %if %{with extension}
 cd hamster-shell-extension-%{ext_version}
 %patch101 -p1
@@ -277,12 +282,13 @@
 %patch171 -p1
 %patch172 -p1
 %patch173 -p1
-%endif
-%endif
 
+%endif # suse_version >= 1600
+%endif # sle_version >= 150400
+%else  # sle_version >= 150200
 mkdir build
 cp %{SOURCE2} build
-%endif
+%endif # sle_version >= 150200
 
 %build
 ./waf --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
@@ -330,7 +336,7 @@
 %{_libexecdir}/hamster/
 %{python3_sitelib}/hamster/
 %{_datadir}/bash-completion/completions/hamster.bash
-%{_datadir}/metainfo/org.gnome.Hamster.GUI.metainfo.xml
+%{_datadir}/metainfo/org.gnome.Hamster.metainfo.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.hamster.gschema.xml
 %{_datadir}/help/C/hamster
 
@@ -339,7 +345,7 @@
    if x < 4 then print(string.format("%.02f", x + 0.01)) else print(x + 1) end}
 
 %package -n gnome-shell-extension-hamster-time-tracker
-Version:        3.0.3~20_%{ext_version}_%{ext_gnome_version}
+Version:        3.0.3_%{ext_version}_%{ext_gnome_version}
 Release:        0
 Summary:        Hamster time tracker extension for GNOME Shell
 License:        GPL-3.0-only

++++++ _service ++++++
--- /var/tmp/diff_new_pack.Ywdwlk/_old	2023-11-21 21:32:10.075675656 +0100
+++ /var/tmp/diff_new_pack.Ywdwlk/_new	2023-11-21 21:32:10.075675656 +0100
@@ -3,11 +3,10 @@
     <param name="scm">git</param>
     <param name="url">https://github.com/projecthamster/hamster.git</param>
     <param name="filename">hamster-time-tracker</param>
-    
-    <param name="version">3.0.3~20</param>
-    <param name="revision">d10ae12</param>
-    
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">v(.*)[+]0$</param>
+    <param name="versionrewrite-replacement">\1</param>
+    <param name="revision">v3.0.3</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="manual">

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Ywdwlk/_old	2023-11-21 21:32:10.095676394 +0100
+++ /var/tmp/diff_new_pack.Ywdwlk/_new	2023-11-21 21:32:10.099676542 +0100
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/projecthamster/hamster.git</param>
-              <param name="changesrevision">d10ae12cde0370233189574d255c831e3eb267ab</param></service></servicedata>
+              <param name="changesrevision">198ebe2a4163129b0cb7e773c257ed48cafa73a4</param></service></servicedata>
 (No newline at EOF)
 

++++++ hamster-time-tracker-3.0.3~20.tar.xz -> hamster-time-tracker-3.0.3.tar.xz ++++++
++++ 5297 lines of diff (skipped)

++++++ remove-text-keyword-from-subprocess.run.patch ++++++
From 3c2c6e597fe70b31a99e28876968b0823009463e Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Mon, 20 Nov 2023 16:41:30 +0100
Subject: [PATCH] remove text= keyword from subprocess.run

---
 wscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wscript b/wscript
index cf89a78..0b0d389 100644
--- a/wscript
+++ b/wscript
@@ -6,7 +6,7 @@ import subprocess
 from waflib import Utils
 
 # Reuse code from hamster to figure out the version number to use
-process = subprocess.run(["python3", "src/hamster/version.py"], check=True, stdout=subprocess.PIPE, text=True)
+process = subprocess.run(["python3", "src/hamster/version.py"], check=True, stdout=subprocess.PIPE)
 VERSION = process.stdout
 APPNAME = 'hamster'
 
-- 
2.42.1


++++++ replace-env-python-invocation-by-direct-call.patch ++++++
++++ 2019 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/hamster-time-tracker/replace-env-python-invocation-by-direct-call.patch
++++ and /work/SRC/openSUSE:Factory/.hamster-time-tracker.new.2521/replace-env-python-invocation-by-direct-call.patch

    

Source-Sync

tags

participants (1)