Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openpgm for openSUSE:Factory checked in at 2021-07-02 13:26:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openpgm (Old) and /work/SRC/openSUSE:Factory/.openpgm.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openpgm" Fri Jul 2 13:26:40 2021 rev:10 rq:902883 version:5.2.122 Changes: -------- --- /work/SRC/openSUSE:Factory/openpgm/openpgm.changes 2020-11-02 14:06:21.628771451 +0100 +++ /work/SRC/openSUSE:Factory/.openpgm.new.2625/openpgm.changes 2021-07-02 13:27:06.588926911 +0200 @@ -1,0 +2,6 @@ +Mon Jun 28 17:37:10 UTC 2021 - Matej Cepl <mc...@suse.com> + +- Add use_python3.patch to allow use of Python3 instead of + Python2 for generating files. + +------------------------------------------------------------------- New: ---- use_python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openpgm.spec ++++++ --- /var/tmp/diff_new_pack.R8FmLo/_old 2021-07-02 13:27:07.068923187 +0200 +++ /var/tmp/diff_new_pack.R8FmLo/_new 2021-07-02 13:27:07.072923156 +0200 @@ -2,7 +2,7 @@ # # spec file for package openpgm # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2012 Pascal Bleser <pascal.ble...@opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -41,6 +41,9 @@ Patch2: libpgm-5.2.122-pkg-config-do-not-add-I-to-non-existing-directory.patch # upstream pending patch https://github.com/steve-o/openpgm/pull/63 Patch3: libpgm-5.2.122-configure-rdtsc-checking-chg.patch +# PATCH-{FIX|FEATURE}-{OPENSUSE|SLE|UPSTREAM} name-of-file.patch bsc#[0-9]+ mc...@suse.com +# this patch makes things totally awesome +Patch4: use_python3.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -48,7 +51,7 @@ BuildRequires: libtool BuildRequires: make BuildRequires: pkgconfig -BuildRequires: python-devel +BuildRequires: python3-base %description OpenPGM is an implementation of the Pragmatic General Multicast (PGM) @@ -81,10 +84,7 @@ %prep %setup -q -n "%{name}-release-%{tarball_version}/openpgm/pgm" -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autopatch -p1 %build export ac_cv_func_ftime=no ++++++ use_python3.patch ++++++ --- SConscript.libpgm | 2 +- version_generator.py | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) --- a/SConscript.libpgm +++ b/SConscript.libpgm @@ -60,7 +60,7 @@ e.Append(CCFLAGS = '-DGETTEXT_PACKAGE=\' e.Command ('galois_tables.c', 'galois_generator.pl', "perl $SOURCE > $TARGET"); # Version stamping -e.Command ('version.c', 'version_generator.py', "python $SOURCE > $TARGET"); +e.Command ('version.c', 'version_generator.py', "python3 $SOURCE > $TARGET"); e.Depends ('version.c', src); src += ['version.c']; --- a/version_generator.py +++ b/version_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import os import platform @@ -7,19 +7,19 @@ import time timestamp = time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) build_date = time.strftime ("%Y-%m-%d", timestamp) build_time = time.strftime ("%H:%M:%S", timestamp) -build_rev = filter (str.isdigit, "$Revision$") +build_rev = ''.join (list (filter (str.isdigit, "$Revision$"))) build_system = platform.system() build_machine = platform.machine() if 'SOURCE_DATE_EPOCH' in os.environ: build_system = 'BuildSystem' build_machine = 'BuildMachine' -print """ +print (""" /* vim:ts=8:sts=8:sw=4:noai:noexpandtab * * OpenPGM version. * - * Copyright (c) 2006-2011 Miru Limited. + * Copyright (c) 2006-2014 Miru Limited. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -47,15 +47,16 @@ print """ const unsigned pgm_major_version = 5; const unsigned pgm_minor_version = 2; -const unsigned pgm_micro_version = 122; -const char* pgm_build_date = "%s"; -const char* pgm_build_time = "%s"; -const char* pgm_build_system = "%s"; -const char* pgm_build_machine = "%s"; -const char* pgm_build_revision = "%s"; +const unsigned pgm_micro_version = 128; +const char* pgm_build_date = "{0}"; +const char* pgm_build_time = "{1}"; +const char* pgm_build_system = "{2}"; +const char* pgm_build_machine = "{3}"; +const char* pgm_build_revision = "{4}"; /* eof */ -"""%(build_date, build_time, build_system, build_machine, build_rev) +""".format (build_date, build_time, build_system, build_machine, build_rev)) # end of file +
