From 5ad5e92283994b3704793ff1924e73b1aaf605de Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Jun 18 2019 11:37:46 +0000 Subject: Fixu build under python3.8 --- diff --git a/libsbml.spec b/libsbml.spec index 89ad9c0..7cee727 100644 --- a/libsbml.spec +++ b/libsbml.spec @@ -33,7 +33,7 @@ Name: libsbml Version: 5.18.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Systems Biology Markup Language library License: LGPLv2+ URL: http://sbml.org/Software/libSBML @@ -46,6 +46,8 @@ Patch0: libsbml-use-system-minizip-cmake.patch ## Fix library installation paths Patch1: libsbml-fix_install_libpaths.patch +Patch2: time-clock.diff + BuildRequires: cmake BuildRequires: zlib-devel BuildRequires: bzip2-devel @@ -202,6 +204,7 @@ This package contains %{summary}. %autosetup -n libSBML-%{version}-Source -N %patch1 -p1 +%patch2 -p1 unzip -n %{SOURCE1} @@ -421,6 +424,10 @@ popd %endif %changelog +* Tue Jun 18 2019 Zbigniew Jędrzejewski-Szmek - 5.18.0-5 +- Fix build under python3.8 (#1718374) +- Make Obsoletes versioned + * Tue Jun 04 2019 Jitka Plesnikova - 5.18.0-4 - Perl 5.30 re-rebuild updated packages diff --git a/time-clock.diff b/time-clock.diff new file mode 100644 index 0000000..306d8da --- /dev/null +++ b/time-clock.diff @@ -0,0 +1,20 @@ +--- libSBML-5.18.0-Source/examples/python/readSBML.py~ 2018-04-24 10:35:07.000000000 +0200 ++++ libSBML-5.18.0-Source/examples/python/readSBML.py 2019-06-18 12:09:58.564685207 +0200 +@@ -54,7 +54,7 @@ + return 1 + + filename = args[1] +- current = time.clock() ++ current = time.process_time() + document = readSBML(filename) + + errors = document.getNumErrors() +@@ -62,7 +62,7 @@ + print() + print(" filename: " + filename) + print(" file size: " + str(os.stat(filename).st_size)) +- print(" read time (ms): " + str(time.clock() - current)) ++ print(" read time (ms): " + str(time.process_time() - current)) + print(" validation error(s): " + str(errors)) + print() + document.printErrors()