Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-stdeb for openSUSE:Factory checked in at 2022-04-24 19:45:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-stdeb (Old) and /work/SRC/openSUSE:Factory/.python-stdeb.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-stdeb" Sun Apr 24 19:45:54 2022 rev:7 rq:972378 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-stdeb/python-stdeb.changes 2020-05-20 18:45:07.741237405 +0200 +++ /work/SRC/openSUSE:Factory/.python-stdeb.new.1538/python-stdeb.changes 2022-04-24 19:45:56.529863309 +0200 @@ -1,0 +2,11 @@ +Sun Apr 24 02:49:58 UTC 2022 - John Vandenberg <[email protected]> + +- Fixed %check by adding missing $ +- Update to v0.10.0 + * The default Debian compat version has been changed from 7 to 9 + as well as new +- from v0.9.1 + * A few improvements for Python 3 as well as new options. +- Updated patches + +------------------------------------------------------------------- Old: ---- stdeb-0.9.0.tar.gz New: ---- stdeb-0.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-stdeb.spec ++++++ --- /var/tmp/diff_new_pack.SZIB8N/_old 2022-04-24 19:45:57.273864141 +0200 +++ /var/tmp/diff_new_pack.SZIB8N/_new 2022-04-24 19:45:57.277864145 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-stdeb # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # 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 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-stdeb -Version: 0.9.0 +Version: 0.10.0 Release: 0 Summary: Python to Debian source package conversion utility License: MIT @@ -91,11 +91,13 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check +cp test.sh test.sh.orig # There is also test2and3.sh which could be inlined here export PATH=/sbin:%{_prefix}/sbin:%{buildroot}/%{_bindir}:$PATH %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} # update-alternatives: use available versioned binaries -sed -i 's:\(_LOC=`which\s\+[-a-zA-Z0-9]\+\):\1-%{python_version}:' test.sh +cp test.sh.orig test.sh +sed -i 's:\(_LOC=`which\s\+[-a-zA-Z0-9]\+\):\1-%{$python_version}:' test.sh PYEXE=$python bash -x ./test.sh } @@ -118,6 +120,6 @@ %python_alternative %{_bindir}/py2dsc-deb %python_alternative %{_bindir}/pypi-download %python_alternative %{_bindir}/pypi-install -%{python_sitelib}/* +%{python_sitelib}/*stdeb* %changelog ++++++ ignore-unmet-deps.patch ++++++ --- /var/tmp/diff_new_pack.SZIB8N/_old 2022-04-24 19:45:57.317864190 +0200 +++ /var/tmp/diff_new_pack.SZIB8N/_new 2022-04-24 19:45:57.321864194 +0200 @@ -1,33 +1,33 @@ -Index: stdeb-0.9.0/stdeb/command/bdist_deb.py +Index: stdeb-0.10.0/stdeb/command/bdist_deb.py =================================================================== ---- stdeb-0.9.0.orig/stdeb/command/bdist_deb.py -+++ stdeb-0.9.0/stdeb/command/bdist_deb.py -@@ -48,7 +48,7 @@ class bdist_deb(Command): +--- stdeb-0.10.0.orig/stdeb/command/bdist_deb.py ++++ stdeb-0.10.0/stdeb/command/bdist_deb.py +@@ -56,7 +56,7 @@ class bdist_deb(Command): raise ValueError('could not find debian source directory') # define system command to execute (gen .deb binary pkg) -- syscmd = ['dpkg-buildpackage','-rfakeroot','-b'] -+ syscmd = ['dpkg-buildpackage','-d','-rfakeroot','-b'] +- syscmd = ['dpkg-buildpackage', '-rfakeroot', '-b'] ++ syscmd = ['dpkg-buildpackage', '-d', '-rfakeroot', '-b'] if not self.sign_results: syscmd.append('-uc') -Index: stdeb-0.9.0/stdeb/util.py +Index: stdeb-0.10.0/stdeb/util.py =================================================================== ---- stdeb-0.9.0.orig/stdeb/util.py -+++ stdeb-0.9.0/stdeb/util.py -@@ -1408,7 +1408,7 @@ def build_dsc(debinfo, - if sign_dsc: - args = () - else: -- args = ('-uc','-us') -+ args = ('-d','-uc','-us') +--- stdeb-0.10.0.orig/stdeb/util.py ++++ stdeb-0.10.0/stdeb/util.py +@@ -1522,7 +1522,7 @@ def build_dsc(debinfo, + args = ['-S', '-sa'] - dpkg_buildpackage('-S','-sa',*args,cwd=fullpath_repackaged_dirname) + if not sign_dsc: +- args += ['-uc', '-us'] ++ args += ['-d', '-uc', '-us'] -Index: stdeb-0.9.0/test.sh + if ignore_source_changes: + args.append('-i.*') +Index: stdeb-0.10.0/test.sh =================================================================== ---- stdeb-0.9.0.orig/test.sh -+++ stdeb-0.9.0/test.sh +--- stdeb-0.10.0.orig/test.sh ++++ stdeb-0.10.0/test.sh @@ -74,7 +74,7 @@ export DEB_BUILD_OPTIONS=nocheck # psyco ${PY2DSC} $SOURCE_TARBALL ++++++ no-install-layout.patch ++++++ --- /var/tmp/diff_new_pack.SZIB8N/_old 2022-04-24 19:45:57.333864207 +0200 +++ /var/tmp/diff_new_pack.SZIB8N/_new 2022-04-24 19:45:57.333864207 +0200 @@ -1,16 +1,16 @@ -Index: stdeb-0.8.5/stdeb/util.py +Index: stdeb-0.10.0/stdeb/util.py =================================================================== ---- stdeb-0.8.5.orig/stdeb/util.py -+++ stdeb-0.8.5/stdeb/util.py -@@ -1480,9 +1480,9 @@ override_dh_auto_build: +--- stdeb-0.10.0.orig/stdeb/util.py ++++ stdeb-0.10.0/stdeb/util.py +@@ -1620,9 +1620,9 @@ override_dh_auto_build: %(rules_override_build_target_pythons)s """ --RULES_OVERRIDE_INSTALL_TARGET_PY2 = " python setup.py install --force --root=debian/%(package)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python2_scripts_cli_args)s" -+RULES_OVERRIDE_INSTALL_TARGET_PY2 = " python setup.py install --force --root=debian/%(package)s --no-compile -O0 %(install_prefix)s %(no_python2_scripts_cli_args)s" +-RULES_OVERRIDE_INSTALL_TARGET_PY2 = " python setup.py install --force --root=debian/%(package)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python2_scripts_cli_args)s" # noqa: E501 ++RULES_OVERRIDE_INSTALL_TARGET_PY2 = " python setup.py install --force --root=debian/%(package)s --no-compile -O0 %(install_prefix)s %(no_python2_scripts_cli_args)s" # noqa: E501 --RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python3_scripts_cli_args)s" -+RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 %(install_prefix)s %(no_python3_scripts_cli_args)s" +-RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 --install-layout=deb %(install_prefix)s %(no_python3_scripts_cli_args)s" # noqa: E501 ++RULES_OVERRIDE_INSTALL_TARGET_PY3 = " python3 setup.py install --force --root=debian/%(package3)s --no-compile -O0 %(install_prefix)s %(no_python3_scripts_cli_args)s" # noqa: E501 RULES_OVERRIDE_INSTALL_TARGET = """ override_dh_auto_install: ++++++ remove-python-helper-rules.patch ++++++ --- /var/tmp/diff_new_pack.SZIB8N/_old 2022-04-24 19:45:57.349864225 +0200 +++ /var/tmp/diff_new_pack.SZIB8N/_new 2022-04-24 19:45:57.353864230 +0200 @@ -1,8 +1,8 @@ -Index: stdeb-0.8.5/stdeb/util.py +Index: stdeb-0.10.0/stdeb/util.py =================================================================== ---- stdeb-0.8.5.orig/stdeb/util.py -+++ stdeb-0.8.5/stdeb/util.py -@@ -1114,7 +1114,10 @@ class DebianInfo: +--- stdeb-0.10.0.orig/stdeb/util.py ++++ stdeb-0.10.0/stdeb/util.py +@@ -1214,7 +1214,10 @@ class DebianInfo: else: self.override_dh_python3 = '' @@ -11,7 +11,7 @@ + # https://salsa.debian.org/cpython-team/python-defaults + # sequencer_options = ['--with '+','.join(sequencer_with)] + sequencer_options = [] - sequencer_options.append('--buildsystem=python_distutils') - self.sequencer_options = ' '.join(sequencer_options) + if with_dh_virtualenv: + if with_python2: ++++++ remove-version-checks.patch ++++++ --- /var/tmp/diff_new_pack.SZIB8N/_old 2022-04-24 19:45:57.369864248 +0200 +++ /var/tmp/diff_new_pack.SZIB8N/_new 2022-04-24 19:45:57.373864252 +0200 @@ -1,38 +1,49 @@ -Index: stdeb-0.8.5/stdeb/util.py +Index: stdeb-0.10.0/stdeb/util.py =================================================================== ---- stdeb-0.8.5.orig/stdeb/util.py -+++ stdeb-0.8.5/stdeb/util.py -@@ -1375,34 +1375,6 @@ def build_dsc(debinfo, +--- stdeb-0.10.0.orig/stdeb/util.py ++++ stdeb-0.10.0/stdeb/util.py +@@ -1512,45 +1512,6 @@ def build_dsc(debinfo, finally: shutil.rmtree(tmp_dir) - if 1: - # check versions of debhelper and python-all - debhelper_version_str = get_version_str('debhelper') -- if len(debhelper_version_str)==0: +- if len(debhelper_version_str) == 0: - log.warn('This version of stdeb requires debhelper >= %s, but you ' - 'do not have debhelper installed. ' -- 'Could not check compatibility.'%DH_MIN_VERS) +- 'Could not check compatibility.' % DH_MIN_VERS) - else: - if not dpkg_compare_versions( -- debhelper_version_str, 'ge', DH_MIN_VERS ): +- debhelper_version_str, 'ge', DH_MIN_VERS +- ): - log.warn('This version of stdeb requires debhelper >= %s. ' -- 'Use stdeb 0.3.x to generate source packages ' -- 'compatible with older versions of debhelper.'%( -- DH_MIN_VERS,)) +- 'Use stdeb 0.9.x to generate source packages ' +- 'compatible with older versions of debhelper.' % ( +- DH_MIN_VERS,)) - -- python_defaults_version_str = get_version_str('python-all') -- if len(python_defaults_version_str)==0: -- log.warn('This version of stdeb requires python-all >= %s, ' -- 'but you do not have this package installed. ' -- 'Could not check compatibility.'%PYTHON_ALL_MIN_VERS) -- else: -- if not dpkg_compare_versions( -- python_defaults_version_str, 'ge', PYTHON_ALL_MIN_VERS): -- log.warn('This version of stdeb requires python-all >= %s. ' -- 'Use stdeb 0.6.0 or older to generate source packages ' -- 'that use python-support.'%( -- PYTHON_ALL_MIN_VERS,)) +- if debinfo.with_python2: +- python_defaults_version_str = get_version_str('python-all') +- +- if len(python_defaults_version_str) == 0: +- log.warn('This version of stdeb requires python-all >= %s, ' +- 'but you do not have this package installed. Could ' +- 'not check compatibility.' % PYTHON_ALL_MIN_VERS) +- else: +- if not dpkg_compare_versions( +- python_defaults_version_str, 'ge', PYTHON_ALL_MIN_VERS +- ): +- log.warn('This version of stdeb requires python-all >= ' +- '%s. Use stdeb 0.6.0 or older to generate source ' +- 'packages that use python-support.' % ( +- PYTHON_ALL_MIN_VERS,)) +- +- if debinfo.with_python3: +- python3_defaults_version_str = get_version_str('python3-all') +- +- if len(python3_defaults_version_str) == 0: +- log.warn('This version of stdeb requires python3-all, ' +- 'but you do not have this package installed.') - # D. restore debianized tree os.rename(fullpath_repackaged_dirname+'.debianized', ++++++ stdeb-0.9.0.tar.gz -> stdeb-0.10.0.tar.gz ++++++ ++++ 3523 lines of diff (skipped)
