Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2020-03-25 23:49:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and      /work/SRC/openSUSE:Factory/.nml.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "nml"

Wed Mar 25 23:49:22 2020 rev:15 rq:788275 version:0.4.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/nml/nml.changes  2019-06-03 18:58:48.968352170 
+0200
+++ /work/SRC/openSUSE:Factory/.nml.new.3160/nml.changes        2020-03-25 
23:50:34.164016230 +0100
@@ -1,0 +2,7 @@
+Tue Mar 24 17:28:15 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Add upstream patch to fix the python 3.8 compatibility:
+  * 0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch
+
+
+-------------------------------------------------------------------

New:
----
  0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch

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

Other differences:
------------------
++++++ nml.spec ++++++
--- /var/tmp/diff_new_pack.oMVLNB/_old  2020-03-25 23:50:35.004016008 +0100
+++ /var/tmp/diff_new_pack.oMVLNB/_new  2020-03-25 23:50:35.004016008 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package nml
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # 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/
 #
 
 
@@ -20,13 +20,15 @@
 Version:        0.4.5
 Release:        0
 Summary:        NewGRF Meta Language
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Tools/Building
-Url:            http://dev.openttdcoop.org/projects/nml
+URL:            http://dev.openttdcoop.org/projects/nml
 Source:         
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.tar.gz
 Source99:       nml-rpmlintrc
 #PATCH-FIX-UPSTREAM Pillow changed it's version string 
https://github.com/OpenTTD/nml/pull/29
 Patch0:                        python-pillow-version.patch
+# PATCH-FIX-UPSTREAM time.clock() is gone in python 3.8
+Patch1:         0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch
 BuildRequires:  gcc
 BuildRequires:  python3-devel
 # We need the required packages also on building for regression tests:
@@ -44,7 +46,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+%autopatch -p1
 
 %build
 make

++++++ 0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch ++++++
>From e706f93926983b4c700953c92bdb35cdd5ffa2f0 Mon Sep 17 00:00:00 2001
From: glx22 <gl...@users.noreply.github.com>
Date: Sun, 20 Oct 2019 11:05:25 +0200
Subject: [PATCH] Fix #52: time.clock() has been removed in python 3.8 (#53)

---
 nml/generic.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nml/generic.py b/nml/generic.py
index ce064b6..8ee602f 100644
--- a/nml/generic.py
+++ b/nml/generic.py
@@ -295,7 +295,7 @@ def clear_progress():
     hide_progress()
 
     if (progress_message is not None) and (verbosity_level >= 
VERBOSITY_TIMING):
-        print("{} {:.1f} s".format(progress_message, time.clock() - 
progress_start_time))
+        print("{} {:.1f} s".format(progress_message, time.process_time() - 
progress_start_time))
 
     progress_message = None
     progress_start_time = None
@@ -324,12 +324,12 @@ def print_progress(msg, incremental = False):
     progress_message = msg
 
     if incremental:
-        t = time.clock()
+        t = time.process_time()
         if (progress_update_time is not None) and (t - progress_update_time < 
1):
             return
         progress_update_time = t
     else:
-        progress_start_time = time.clock()
+        progress_start_time = time.process_time()
 
     print_eol(msg)
 
-- 
2.25.1


Reply via email to