February 2021 - openSUSE Commits - openSUSE Mailing Lists

commit python-pykickstart for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pykickstart for openSUSE:Factory checked in at 2021-02-02 14:24:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pykickstart (Old) and /work/SRC/openSUSE:Factory/.python-pykickstart.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pykickstart" Tue Feb 2 14:24:49 2021 rev:3 rq:868037 version:3.30 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pykickstart/python-pykickstart.changes 2020-12-21 10:27:01.508225297 +0100 +++ /work/SRC/openSUSE:Factory/.python-pykickstart.new.28504/python-pykickstart.changes 2021-02-02 14:24:55.111321533 +0100 @@ -1,0 +2,5 @@ +Sun Jan 31 00:07:23 UTC 2021 - Neal Gompa <ngompa13(a)gmail.com> + +- Adapt for new singlespec style + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pykickstart.spec ++++++ --- /var/tmp/diff_new_pack.nZlw9G/_old 2021-02-02 14:24:55.687322429 +0100 +++ /var/tmp/diff_new_pack.nZlw9G/_new 2021-02-02 14:24:55.691322435 +0100 @@ -66,11 +66,33 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} +%python_clone -a %{buildroot}%{_bindir}/ksflatten +%python_clone -a %{buildroot}%{_mandir}/man1/ksflatten.1 +%python_clone -a %{buildroot}%{_bindir}/ksshell +%python_clone -a %{buildroot}%{_mandir}/man1/ksshell.1 +%python_clone -a %{buildroot}%{_bindir}/ksvalidator +%python_clone -a %{buildroot}%{_mandir}/man1/ksvalidator.1 +%python_clone -a %{buildroot}%{_bindir}/ksverdiff +%python_clone -a %{buildroot}%{_mandir}/man1/ksverdiff.1 %check %python_expand PYTHONPATH=.. $python -m unittest discover -v +%post +%python_install_alternative ksflatten ksflatten.1%{?ext_man} +%python_install_alternative ksshell ksshell.1%{?ext_man} +%python_install_alternative ksvalidator ksvalidator.1%{?ext_man} +%python_install_alternative ksverdiff ksverdiff.1%{?ext_man} + + +%postun +%python_uninstall_alternative ksflatten ksflatten.1%{?ext_man} +%python_uninstall_alternative ksshell ksshell.1%{?ext_man} +%python_uninstall_alternative ksvalidator ksvalidator.1%{?ext_man} +%python_uninstall_alternative ksverdiff ksverdiff.1%{?ext_man} + + %files %{python_files} %license COPYING %doc README.rst @@ -80,7 +102,14 @@ %doc docs/kickstart-docs.txt %{python_sitelib}/%{mod_name}/ %{python_sitelib}/%{mod_name}-* -%python3_only %{_bindir}/* -%python3_only %{_mandir}/man1/* +%python_alternative %{_bindir}/ksflatten +%python_alternative %{_mandir}/man1/ksflatten.1%{?ext_man} +%python_alternative %{_bindir}/ksshell +%python_alternative %{_mandir}/man1/ksshell.1%{?ext_man} +%python_alternative %{_bindir}/ksvalidator +%python_alternative %{_mandir}/man1/ksvalidator.1%{?ext_man} +%python_alternative %{_bindir}/ksverdiff +%python_alternative %{_mandir}/man1/ksverdiff.1%{?ext_man} + %changelog

1 0

commit ocaml-gettext for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-gettext for openSUSE:Factory checked in at 2021-02-02 14:24:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-gettext (Old) and /work/SRC/openSUSE:Factory/.ocaml-gettext.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-gettext" Tue Feb 2 14:24:45 2021 rev:6 rq:867970 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-gettext/ocaml-gettext.changes 2020-08-24 15:06:56.910506508 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-gettext.new.28504/ocaml-gettext.changes 2021-02-02 14:24:53.435318926 +0100 @@ -1,0 +2,5 @@ +Thu Jan 21 21:21:21 UTC 2021 - ohering(a)suse.de + +- remove dependency to ounit via _multibuild + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-gettext.spec ++++++ --- /var/tmp/diff_new_pack.wzoJvk/_old 2021-02-02 14:24:54.027319847 +0100 +++ /var/tmp/diff_new_pack.wzoJvk/_new 2021-02-02 14:24:54.031319853 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml-gettext # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,15 @@ # -Name: ocaml-gettext +%define build_flavor @BUILD_FLAVOR@%{nil} +%if "%{build_flavor}" == "testsuite" +%define nsuffix -testsuite +%else +%define nsuffix %{nil} +%endif + +%define pkg ocaml-gettext +Name: %{pkg}%{nsuffix} Version: 0.4.2 Release: 0 %{?ocaml_preserve_bytecode} @@ -24,17 +32,25 @@ License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/gettext -Source0: %{name}-%{version}.tar.xz +Source0: %{pkg}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20200514 +BuildRequires: ocaml-rpm-macros >= 20210121 +%if 1 BuildRequires: ocamlfind(camomile) BuildRequires: ocamlfind(compiler-libs.common) BuildRequires: ocamlfind(cppo) BuildRequires: ocamlfind(dune.configurator) BuildRequires: ocamlfind(fileutils) +%endif + +%if "%{build_flavor}" == "testsuite" +BuildRequires: ocamlfind(fileutils) +BuildRequires: ocamlfind(gettext) BuildRequires: ocamlfind(oUnit) BuildRequires: ocamlfind(str) +%endif + # ocaml-gettext program needs camomile data files Requires: ocaml-camomile-data # @@ -70,26 +86,34 @@ developing applications that use %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{pkg}-%{version} %build dune_release_pkgs='gettext,gettext-camomile,gettext-stub' %ocaml_dune_setup +%if "%{build_flavor}" == "" %ocaml_dune_build +%endif %install +%if "%{build_flavor}" == "" %ocaml_dune_install %ocaml_create_file_list grep -m1 '%%dir' %{name}.files.devel | tee %{name}.files.stub-devel +%endif +%if "%{build_flavor}" == "testsuite" %check -dune_test_tolerate_fail='dune_test_tolerate_fail' %ocaml_dune_test +%endif +%if "%{build_flavor}" == "" %files -f %{name}.files %{_bindir}/* %{_mandir}/*/* %files devel -f %{name}.files.devel +%endif + %changelog ++++++ _multibuild ++++++ <multibuild> <package>testsuite</package> </multibuild>

1 0

commit ocaml-fileutils for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-fileutils for openSUSE:Factory checked in at 2021-02-02 14:24:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-fileutils (Old) and /work/SRC/openSUSE:Factory/.ocaml-fileutils.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ocaml-fileutils" Tue Feb 2 14:24:47 2021 rev:6 rq:867971 version:0.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-fileutils/ocaml-fileutils.changes 2020-08-24 15:06:38.370497474 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-fileutils.new.28504/ocaml-fileutils.changes 2021-02-02 14:24:54.383320401 +0100 @@ -1,0 +2,5 @@ +Thu Jan 21 21:21:21 UTC 2021 - ohering(a)suse.de + +- remove dependency to ounit via _multibuild + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-fileutils.spec ++++++ --- /var/tmp/diff_new_pack.J0osGK/_old 2021-02-02 14:24:54.859321141 +0100 +++ /var/tmp/diff_new_pack.J0osGK/_new 2021-02-02 14:24:54.863321148 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml-fileutils # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,15 @@ # -Name: ocaml-fileutils +%define build_flavor @BUILD_FLAVOR@%{nil} +%if "%{build_flavor}" == "testsuite" +%define nsuffix -testsuite +%else +%define nsuffix %{nil} +%endif + +%define pkg ocaml-fileutils +Name: %{pkg}%{nsuffix} Version: 0.6.3 Release: 0 %{?ocaml_preserve_bytecode} @@ -24,16 +32,21 @@ License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/fileutils -Source0: %{name}-%{version}.tar.xz +Source0: %{pkg}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20200514 +BuildRequires: ocaml-rpm-macros >= 20210121 BuildRequires: ocamlfind(bytes) -BuildRequires: ocamlfind(oUnit) BuildRequires: ocamlfind(stdlib-shims) BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) +%if "%{build_flavor}" == "testsuite" +BuildRequires: ocamlfind(fileutils) +BuildRequires: ocamlfind(oUnit) +BuildRequires: ocamlfind(stdlib-shims) +%endif + %description This library is intended to provide a basic interface to the most common file and filename operations. It provides several different @@ -54,23 +67,31 @@ developing applications that use %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n %{pkg}-%{version} %build dune_release_pkgs='fileutils' %ocaml_dune_setup +%if "%{build_flavor}" == "" %ocaml_dune_build +%endif %install +%if "%{build_flavor}" == "" %ocaml_dune_install %ocaml_create_file_list +%endif +%if "%{build_flavor}" == "testsuite" %check %ocaml_dune_test +%endif +%if "%{build_flavor}" == "" %files -f %{name}.files -%doc README.md %files devel -f %{name}.files.devel +%endif + %changelog ++++++ _multibuild ++++++ <multibuild> <package>testsuite</package> </multibuild>

1 0

commit python-dns-lexicon for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-dns-lexicon for openSUSE:Factory checked in at 2021-02-02 14:24:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-dns-lexicon (Old) and /work/SRC/openSUSE:Factory/.python-dns-lexicon.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-dns-lexicon" Tue Feb 2 14:24:39 2021 rev:14 rq:867444 version:3.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-dns-lexicon/python-dns-lexicon.changes 2020-07-08 19:13:52.211292147 +0200 +++ /work/SRC/openSUSE:Factory/.python-dns-lexicon.new.28504/python-dns-lexicon.changes 2021-02-02 14:24:50.699314671 +0100 @@ -1,0 +2,46 @@ +Thu Jan 28 01:09:45 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Update to Version 3.5.3 + * Handle large number of hosted zones in route53 provider +- Changelog for 3.5.2 + * Fix domains in "lock" state with joker provider +- Changelog for 3.5.1 + * Add the Joker.com provider + * Add environment variable TLDEXTRACT_CACHE_PATH to configure a + tldextract cache custom location for Lexicon + * Old environment variable TLDEXTRACT_CACHE_FILE is deprecated + and will be removed in a future release +- Changelog for 3.5.0 + * Avoid installation problems with setuptools==50 + * Migrating codebase to Python 3.6+ specific features (Lexicon + will explicitly break on older versions now) + * Fix Easyname provider to work with their new website +- Changelog for 3.4.5 + * Add pagination support to Google Cloud DNS provider (#577) + * Add official support to Python 3.9 + * Add SSHFP record support to CloudFlare provider (library only) + (#612) +- Changelog for 3.4.4 + * Fix Gandi provider to use the new LiveDNS API URL +- Changelog for 3.4.3 + * Improve versions constraints by declaring latest major versions + known to work with Lexicon +- Changelog for 3.4.2 + * Relax versions constraints on Lexicon dependencies until there + is a real need. +- Changelog for 3.4.1 + * Add the Njalla provider +- Changelog for 3.4.0 + * Use poetry to manage dependencies, build and package Lexicon. + * The beautifulsoup4 dependency has been integrated to the core + ones for generic purpose. As a consequence henet, easyname and + gratisdns providers do not have optional dependencies anymore. + * Remove support for Python 2.7. + * Remove support for Python 3.5. + * Remove the extra security from requests dependency which does + not make sense anymore on recent versions of Python. +- Changelog for 3.3.28 + * Fix localzone provider to make it work with dnspython 2.x. + * Update easyname provider against the recent API changes. + +------------------------------------------------------------------- @@ -16,0 +63 @@ +- add remove-mock.patch gh#AnalogJ/lexicon#706 Old: ---- lexicon-3.3.26.tar.gz New: ---- lexicon-3.5.3.tar.gz remove-mock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-dns-lexicon.spec ++++++ --- /var/tmp/diff_new_pack.h5sl0H/_old 2021-02-02 14:24:51.811316401 +0100 +++ /var/tmp/diff_new_pack.h5sl0H/_new 2021-02-02 14:24:51.819316413 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-dns-lexicon # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,50 +19,58 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-dns-lexicon -Version: 3.3.26 +Version: 3.5.3 Release: 0 Summary: DNS record manipulation utility License: MIT URL: https://github.com/AnalogJ/lexicon Source0: https://github.com/AnalogJ/lexicon/archive/v%{version}.tar.gz#/lexicon-%{ve… -BuildRequires: %{python_module PyNamecheap} +# PATCH-FIX-UPSTREAM remove-mock.patch gh#AnalogJ/lexicon#706 +Patch0: remove-mock.patch +BuildRequires: fdupes +BuildRequires: python-rpm-macros +# SECTION Python build system requirements +BuildRequires: %{python_module pip} +BuildRequires: %{python_module poetry} +BuildRequires: %{python_module setuptools} +# /SECTION +# SECTION poetry.dependencies BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module beautifulsoup4} -BuildRequires: %{python_module boto3} BuildRequires: %{python_module cryptography} -BuildRequires: %{python_module dnspython >= 1.15.0} BuildRequires: %{python_module future} -BuildRequires: %{python_module html5lib} -BuildRequires: %{python_module localzone} -BuildRequires: %{python_module mock >= 2.0.0} -BuildRequires: %{python_module pytest >= 3.8.0} BuildRequires: %{python_module requests} -BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module softlayer} BuildRequires: %{python_module tldextract} -BuildRequires: %{python_module transip >= 0.3.0} -BuildRequires: %{python_module vcrpy >= 1.13.0} +# /SECTION +# SECTION extras +BuildRequires: %{python_module PyNamecheap} +BuildRequires: %{python_module boto3} +BuildRequires: %{python_module localzone} +BuildRequires: %{python_module softlayer => 5} +BuildRequires: %{python_module transip >= 2} BuildRequires: %{python_module xmltodict} BuildRequires: %{python_module zeep} -BuildRequires: fdupes -BuildRequires: python-rpm-macros -Requires: python-PyNamecheap +# /section +# SECTION test dependencies +BuildRequires: %{python_module pytest >= 3.8.0} +BuildRequires: %{python_module vcrpy >= 1.13.0} +# /SECTION Requires: python-PyYAML Requires: python-beautifulsoup4 -Requires: python-boto3 Requires: python-cryptography -Requires: python-dnspython >= 1.15.0 Requires: python-future -Requires: python-localzone Requires: python-requests -Requires: python-setuptools -Requires: python-softlayer Requires: python-tldextract -Requires: python-transip >= 0.3.0 Requires: python-vcrpy -Requires: python-xmltodict Requires(post): update-alternatives Requires(postun): update-alternatives +Recommends: python-PyNamecheap +Recommends: python-boto3 +Recommends: python-localzone +Recommends: python-softlayer >= 5 +Recommends: python-transip >= 2 +Recommends: python-xmltodict +Recommends: python-zeep # Completely different pkg but same namespace Conflicts: python-lexicon BuildArch: noarch @@ -76,26 +84,21 @@ Lexicon was designed to be used in automation, specifically letsencrypt. %prep -%setup -q -n lexicon-%{version} -# Remove, since they are completely broken -rm lexicon/tests/providers/test_auto.py - +%autosetup -p1 -n lexicon-%{version} # rpmlint find . -type f -name ".gitignore" -delete %build -%python_build - -# rpmlint -find . -type f -name ".buildinfo" -delete +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/lexicon %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest lexicon/tests +# test_auto does not work inside OBS +%pytest lexicon/tests --ignore lexicon/tests/providers/test_auto.py %post %python_install_alternative lexicon @@ -104,9 +107,10 @@ %python_uninstall_alternative lexicon %files %{python_files} -%{python_sitelib} %license LICENSE -%doc README.md +%doc README.rst %python_alternative %{_bindir}/lexicon +%{python_sitelib}/lexicon +%{python_sitelib}/dns_lexicon-%{version}*-info %changelog ++++++ lexicon-3.3.26.tar.gz -> lexicon-3.5.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-dns-lexicon/lexicon-3.3.26.tar.gz /work/SRC/openSUSE:Factory/.python-dns-lexicon.new.28504/lexicon-3.5.3.tar.gz differ: char 12, line 1 ++++++ remove-mock.patch ++++++ Index: lexicon-3.5.3/lexicon/tests/test_library.py =================================================================== --- lexicon-3.5.3.orig/lexicon/tests/test_library.py +++ lexicon-3.5.3/lexicon/tests/test_library.py @@ -12,7 +12,7 @@ import importlib import pkgutil from types import ModuleType -import mock +from unittest import mock import pytest from lexicon.config import ConfigResolver Index: lexicon-3.5.3/lexicon/tests/providers/test_auto.py =================================================================== --- lexicon-3.5.3.orig/lexicon/tests/providers/test_auto.py +++ lexicon-3.5.3/lexicon/tests/providers/test_auto.py @@ -2,7 +2,7 @@ import socket from unittest import TestCase -import mock +from unittest import mock import pytest from lexicon.providers.auto import _get_ns_records_domains_for_domain

1 0

commit usbauth-notifier for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package usbauth-notifier for openSUSE:Factory checked in at 2021-02-02 14:24:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbauth-notifier (Old) and /work/SRC/openSUSE:Factory/.usbauth-notifier.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "usbauth-notifier" Tue Feb 2 14:24:37 2021 rev:5 rq:865340 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/usbauth-notifier/usbauth-notifier.changes 2020-02-04 19:57:18.101459775 +0100 +++ /work/SRC/openSUSE:Factory/.usbauth-notifier.new.28504/usbauth-notifier.changes 2021-02-02 14:24:45.535306640 +0100 @@ -1,0 +2,9 @@ +Sun Dec 27 18:24:10 UTC 2020 - Callum Farmer <gmbr3(a)opensuse.org> + +- Update to version 1.0.2: + * move usbauth-npriv from bindir to libexecdir + * move usbauth-notifier from libdir to libexecdir +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) +- Create lang package + +------------------------------------------------------------------- Old: ---- usbauth-notifier.tar.bz2 New: ---- usbauth-notifier-1.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbauth-notifier.spec ++++++ --- /var/tmp/diff_new_pack.Kf2eH0/_old 2021-02-02 14:24:46.079307486 +0100 +++ /var/tmp/diff_new_pack.Kf2eH0/_new 2021-02-02 14:24:46.083307492 +0100 @@ -20,16 +20,13 @@ Name: usbauth-notifier -Version: 1.0 +Version: 1.0.2 Release: 0 Summary: Notifier for USB Firewall to use with desktop environments License: GPL-2.0-only Group: System/X11/Utilities URL: https://github.com/kochstefan/usbauth-all/tree/master/usbauth-notifier - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}.tar.bz2 - +Source0: %{name}-%{version}.tar.xz Requires(pre): permissions Requires: usbauth BuildRequires: gettext-runtime @@ -44,8 +41,10 @@ %description A notifier for the usbauth firewall against BadUSB attacks. The user could manually allow or deny USB devices. +%lang_package + %prep -%setup -n %{name} +%setup -q -n %{name}-%{version} %build autoreconf -f -i @@ -58,23 +57,24 @@ %install %make_install +%find_lang %{name} %files -%defattr(-,root,root) %doc COPYING README %dir /etc/xdg/autostart /etc/xdg/autostart/usbauth-notifier.desktop -%verify(not mode) %attr(04750,root,usbauth) %_bindir/usbauth-npriv -%dir %verify(not mode) %attr(00750,root,usbauth-notifier) /usr/lib/usbauth-notifier -%verify(not mode) %attr(02755,root,usbauth) /usr/lib/usbauth-notifier/usbauth-notifier +%verify(not mode) %attr(04750,root,usbauth) %{_libexecdir}/usbauth-npriv +%dir %verify(not mode) %attr(00750,root,usbauth-notifier) %{_libexecdir}/usbauth-notifier +%verify(not mode) %attr(02755,root,usbauth) %{_libexecdir}/usbauth-notifier/usbauth-notifier %_mandir/man1/usbauth-notifier.1* %_mandir/man1/usbauth-npriv.1* -%_datadir/locale/*/LC_MESSAGES/usbauth-notifier.mo + +%files lang -f %{name}.lang %post -%set_permissions %_bindir/usbauth-npriv /usr/lib/usbauth-notifier /usr/lib/usbauth-notifier/usbauth-notifier +%set_permissions %{_libexecdir}/usbauth-npriv %{_libexecdir}/usbauth-notifier %{_libexecdir}/usbauth-notifier/usbauth-notifier %verifyscript -%verify_permissions -e %_bindir/usbauth-npriv /usr/lib/usbauth-notifier /usr/lib/usbauth-notifier/usbauth-notifier +%verify_permissions -e %{_libexecdir}/usbauth-npriv %{_libexecdir}/usbauth-notifier %{_libexecdir}/usbauth-notifier/usbauth-notifier %changelog

1 0

commit vagrant for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2021-02-02 14:24:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vagrant" Tue Feb 2 14:24:36 2021 rev:29 rq:867754 version:2.2.14 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2021-01-22 12:15:37.653788551 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.28504/vagrant.changes 2021-02-02 14:24:43.995304245 +0100 @@ -1,0 +2,21 @@ +Fri Jan 29 15:35:11 UTC 2021 - Dan ��erm��k <dcermak(a)suse.com> + +- Remove pointless ruby_dep dependency and bump listen version + + Add patch: + * 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch + + Rebase patches: + * 0001-bin-vagrant-silence-warning-about-installer.patch + * 0002-Use-a-private-temporary-dir.patch + * 0003-plugins-don-t-abuse-require_relative.patch.patch + * 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + * 0005-do-not-depend-on-wdm.patch + * 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + * 0007-Don-t-abuse-relative-paths-in-plugins.patch + * 0008-Skip-failing-tests.patch + * 0009-Disable-Subprocess-unit-test.patch + * 0010-Update-rake-to-13.0.patch + * 0011-Remove-not-required-bcrypt_pbkdf-gem.patch + +------------------------------------------------------------------- New: ---- 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.043305875 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.043305875 +0100 @@ -61,6 +61,8 @@ Patch10: 0010-Update-rake-to-13.0.patch # https://github.com/hashicorp/vagrant/pull/12147 Patch11: 0011-Remove-not-required-bcrypt_pbkdf-gem.patch +# https://github.com/hashicorp/vagrant/pull/12148 +Patch12: 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,8 +99,9 @@ BuildRequires: %{rubygem erubi } # s.add_dependency "i18n", "~> 1.8" BuildRequires: %{rubygem i18n:1 >= 1.8 } -# s.add_dependency "listen", "~> 3.1" -BuildRequires: %{rubygem listen:3 >= 3.1 } +# PATCHED +# s.add_dependency "listen", "~> 3.4" +BuildRequires: %{rubygem listen:3 >= 3.4 } # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" BuildRequires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5 } # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" @@ -135,15 +138,13 @@ BuildRequires: %{rubygem rspec:3.5 } # s.add_development_dependency "rspec-its", "~> 1.3.0" BuildRequires: %{rubygem rspec-its:1.3 } -# s.add_dependency "ruby_dep", "<= 1.3.1" -BuildRequires: %{rubygem ruby_dep <= 1.3.1 } # s.add_development_dependency "webmock", "~> 2.3.1" BuildRequires: %{rubygem webmock:2.3 >= 2.3.1 } # s.add_development_dependency "fake_ftp", "~> 0.1.1" BuildRequires: %{rubygem fake_ftp:0.1 >= 0.1.1 } # Prevent have choice for rubygem(ruby:2.7.0:listen:3) >= 3.1 -BuildRequires: %{rubygem listen:3.1} +BuildRequires: %{rubygem listen:3.4} # Prevent have choice for rubygem(ruby:2.6.0:mime-types) >= 2 BuildRequires: %{rubygem mime-types:3 } # Prevent have choice for rubygem(ruby:2.6.0:builder) >= 2.1.2 @@ -186,8 +187,9 @@ Requires: %{rubygem erubi} # s.add_dependency "i18n", "~> 1.8" Requires: %{rubygem i18n:1 >= 1.8} -# s.add_dependency "listen", "~> 3.1" -Requires: %{rubygem listen:3 >= 3.1} +# PATCHED +# s.add_dependency "listen", "~> 3.4" +Requires: %{rubygem listen:3 >= 3.4} # s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" Requires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5} # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" @@ -215,8 +217,6 @@ Requires: %{rubygem winrm-elevated:1 >= 1.2.1} # s.add_dependency "vagrant_cloud", "~> 3.0.2" Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.2} -# s.add_dependency "ruby_dep", "<= 1.3.1" -Requires: %{rubygem ruby_dep <= 1.3.1 } Requires: bsdtar ++++++ 0001-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.063305906 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.067305912 +0100 @@ -1,7 +1,7 @@ From 3559bd65aa796772e31abbeb4bd92e0829ed5e99 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <terceiro(a)debian.org> Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/11] bin/vagrant: silence warning about installer +Subject: [PATCH 01/12] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl <kastl(a)b1-systems.de> --- ++++++ 0002-Use-a-private-temporary-dir.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.075305925 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.075305925 +0100 @@ -1,7 +1,7 @@ From b2c6ef61dc339eae73640c357e6be6e1f8cf723a Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <terceiro(a)debian.org> Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/11] Use a private temporary dir +Subject: [PATCH 02/12] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). ++++++ 0003-plugins-don-t-abuse-require_relative.patch.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.083305937 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.083305937 +0100 @@ -1,7 +1,7 @@ From 402f323f982ea36af2db24ac62ec527ff6530515 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <kastl(a)b1-systems.de> Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/11] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 03/12] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl <kastl(a)b1-systems.de> --- ++++++ 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.091305949 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.095305956 +0100 @@ -1,7 +1,7 @@ From cb36ee51bb914627bda93641135721ee88b640a4 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <kastl(a)b1-systems.de> Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/11] fix vbox package boo#1044087, added by +Subject: [PATCH 04/12] fix vbox package boo#1044087, added by robert.munteanu(a)gmail.com on Sun Aug 13 19:07:06 UTC 2017 Signed-off-by: Johannes Kastl <kastl(a)b1-systems.de> ++++++ 0005-do-not-depend-on-wdm.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.103305968 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.103305968 +0100 @@ -1,7 +1,7 @@ From b65df008243ff8016b0e5714da53b5fb221e5961 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <kastl(a)b1-systems.de> Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/11] do not depend on wdm +Subject: [PATCH 05/12] do not depend on wdm Signed-off-by: Johannes Kastl <kastl(a)b1-systems.de> --- ++++++ 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.111305980 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.115305987 +0100 @@ -1,7 +1,7 @@ From 4f32f38bb823405a3e3fcd54ebf878ad7c2ff78d Mon Sep 17 00:00:00 2001 From: Johannes Kastl <kastl(a)b1-systems.de> Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/11] do not abuse relative paths in docker plugin to make +Subject: [PATCH 06/12] do not abuse relative paths in docker plugin to make docker work, added by tmkn(a)tmkn.uk on Thu Oct 26 19:42:46 UTC 2017 Signed-off-by: Johannes Kastl <kastl(a)b1-systems.de> ++++++ 0007-Don-t-abuse-relative-paths-in-plugins.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.123305999 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.123305999 +0100 @@ -1,7 +1,7 @@ From 555f29e1367c56ad4aa17447a5108a7f3be1b91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak(a)suse.com> Date: Fri, 11 Jan 2019 12:32:28 +0100 -Subject: [PATCH 07/11] Don't abuse relative paths in plugins +Subject: [PATCH 07/12] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ++++++ 0008-Skip-failing-tests.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.131306011 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.131306011 +0100 @@ -1,7 +1,7 @@ From 5f9ae130821abc783b793fc222c471cebadf1891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak(a)suse.com> Date: Mon, 1 Apr 2019 17:28:31 +0200 -Subject: [PATCH 08/11] Skip failing tests +Subject: [PATCH 08/12] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- ++++++ 0009-Disable-Subprocess-unit-test.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.143306030 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.143306030 +0100 @@ -1,7 +1,7 @@ From 5e3f0edc8a1bc1db2355c424684a3fcd7f654e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak(a)suse.com> Date: Wed, 28 Aug 2019 13:39:58 +0200 -Subject: [PATCH 09/11] Disable Subprocess unit test +Subject: [PATCH 09/12] Disable Subprocess unit test This unit test is *very* flaky on OBS' workers and causes random build failures. These are probably caused by worker being under high load and then ++++++ 0010-Update-rake-to-13.0.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.155306049 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.155306049 +0100 @@ -1,7 +1,7 @@ From 25b740d34eac7a430f248711ac6b97caadeecac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak(a)suse.com> Date: Fri, 4 Dec 2020 14:54:50 +0100 -Subject: [PATCH 10/11] Update rake to ~> 13.0 +Subject: [PATCH 10/12] Update rake to ~> 13.0 (cherry picked from commit 1916f69425f8a0f86e3d7249a25a116c5cf2a771) --- ++++++ 0011-Remove-not-required-bcrypt_pbkdf-gem.patch ++++++ --- /var/tmp/diff_new_pack.vyM6Qn/_old 2021-02-02 14:24:45.163306061 +0100 +++ /var/tmp/diff_new_pack.vyM6Qn/_new 2021-02-02 14:24:45.167306068 +0100 @@ -1,7 +1,7 @@ From c87044b9007fa5f6331206b5edd9f7b6bfde4cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak(a)suse.com> Date: Fri, 22 Jan 2021 09:35:47 +0100 -Subject: [PATCH 11/11] Remove not required bcrypt_pbkdf gem +Subject: [PATCH 11/12] Remove not required bcrypt_pbkdf gem This gem is no longer required by vagrant and was forgotten to get removed. ++++++ 0012-Bump-listen-gem-version-and-remove-ruby_dep.patch ++++++ From b249aefa283644b029adf807907023af5794f595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak(a)suse.com> Date: Fri, 22 Jan 2021 12:36:25 +0100 Subject: [PATCH 12/12] Bump listen gem version and remove ruby_dep listen no longer depends on ruby_dep and thus this pointlessly drags in another dependency. (cherry picked from commit 97ebb9103f9b073f39bf7d4b06d8dbf966793752) --- vagrant.gemspec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index 225283771..465bffaff 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency "erubi" s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "i18n", "~> 1.8" - s.add_dependency "listen", "~> 3.1" + s.add_dependency "listen", "~> 3.4" s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" s.add_dependency "mime-types", "~> 3.3" s.add_dependency "net-ssh", ">= 6.2.0.rc1", "< 7" @@ -33,12 +33,6 @@ Gem::Specification.new do |s| s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" - # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions - # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5). - # Explicit constraint is defined to provide required dependency to listen without imposing - # tighter restrictions on valid ruby versions - s.add_dependency "ruby_dep", "<= 1.3.1" - # Constraint rake to properly handle deprecated method usage # from within rspec s.add_development_dependency "rake", "~> 13.0" -- 2.30.0

1 0

commit python-tqdm for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-tqdm for openSUSE:Factory checked in at 2021-02-02 14:24:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tqdm (Old) and /work/SRC/openSUSE:Factory/.python-tqdm.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tqdm" Tue Feb 2 14:24:34 2021 rev:40 rq:868325 version:4.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tqdm/python-tqdm.changes 2021-01-15 19:45:13.881932770 +0100 +++ /work/SRC/openSUSE:Factory/.python-tqdm.new.28504/python-tqdm.changes 2021-02-02 14:24:41.639300581 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 09:11:40 UTC 2021 - Benjamin Greiner <code(a)bnavigator.de> + +- Simplify the rich supplements in the bash completions package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tqdm.spec ++++++ --- /var/tmp/diff_new_pack.DOdWFx/_old 2021-02-02 14:24:42.267301557 +0100 +++ /var/tmp/diff_new_pack.DOdWFx/_new 2021-02-02 14:24:42.271301563 +0100 @@ -66,7 +66,7 @@ %package -n %allpython-tqdm-bash-completion Summary: Bash completion for python-tqdm Requires: bash-completion -Supplements: ((%{lua: print(string.sub(rpm.expand("%{python_module tqdm or}"),0,-4))}) and bash) +Supplements: %{python_module tqdm and bash-completion} %description -n %allpython-tqdm-bash-completion tqdm lets you output a progress meter from within loops by wrapping

1 0

commit python-rpm-macros for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-rpm-macros for openSUSE:Factory checked in at 2021-02-02 14:24:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.python-rpm-macros.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rpm-macros" Tue Feb 2 14:24:32 2021 rev:34 rq:868221 version:20210131.ec7577b Changes: -------- --- /work/SRC/openSUSE:Factory/python-rpm-macros/python-rpm-macros.changes 2021-01-15 19:42:57.349714070 +0100 +++ /work/SRC/openSUSE:Factory/.python-rpm-macros.new.28504/python-rpm-macros.changes 2021-02-02 14:24:40.343298565 +0100 @@ -1,0 +2,47 @@ +Sun Jan 31 20:38:20 UTC 2021 - mcepl(a)cepl.eu + +- Update to version 20210131.ec7577b: + * remove old commented path finding section + * expand python_subpackage_only not earlier than in python_subpackages call + * make the path and var macros return a non-interrupted string even when the flavor is not installed + +------------------------------------------------------------------- +Sun Jan 31 13:31:40 UTC 2021 - mcepl(a)cepl.eu + +- Update to version 20210131.1450767: + * only add parentheses when boolean operators are used + * sync buildset definitions with Factory + * fix typo + +------------------------------------------------------------------- +Wed Jan 27 22:48:28 UTC 2021 - mcepl(a)cepl.eu + +- Update to version 20210127.3a18043: + * dont't rename wheel when it already has the same name + +------------------------------------------------------------------- +Tue Jan 26 21:11:34 UTC 2021 - mcepl(a)cepl.eu + +- Update to version 20210126.fea1c1f: + * Document python_module with boolean dependecies + * workaround undetected abi and platform tags gh#openSUSE/python-rpm-macros#93 + +------------------------------------------------------------------- +Thu Jan 21 11:10:22 UTC 2021 - mcepl(a)cepl.eu + +- Update to version 20210121.ef5b8b9: + * Add %python pseudo-macro for %python_modules -- server and rpm version + +------------------------------------------------------------------- +Sun Jan 17 07:07:30 UTC 2021 - mcepl(a)cepl.eu + +- Update to version 20210117.63cf413: + * improve flavor variable naming in python_expand + +------------------------------------------------------------------- +Sat Jan 16 12:29:33 UTC 2021 - mcepl(a)cepl.eu + +- Update to version 20210116.2682657: + * remove python2 not found error + +------------------------------------------------------------------- Old: ---- python-rpm-macros-20210112.86f4d9d.tar.xz New: ---- python-rpm-macros-20210131.ec7577b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rpm-macros.spec ++++++ --- /var/tmp/diff_new_pack.sJmvDz/_old 2021-02-02 14:24:41.035299641 +0100 +++ /var/tmp/diff_new_pack.sJmvDz/_new 2021-02-02 14:24:41.035299641 +0100 @@ -17,7 +17,7 @@ Name: python-rpm-macros -Version: 20210112.86f4d9d +Version: 20210131.ec7577b Release: 0 Summary: RPM macros for building of Python modules License: WTFPL ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.sJmvDz/_old 2021-02-02 14:24:41.083299716 +0100 +++ /var/tmp/diff_new_pack.sJmvDz/_new 2021-02-02 14:24:41.087299722 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/python-rpm-macros.git</param> - <param name="changesrevision">16d3497aadc60ea99a1e28894b8d9bd073ac3e29</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">296eb32e76011293f6949392aec8c12c63febdc9</param></service></servicedata> \ No newline at end of file ++++++ python-rpm-macros-20210112.86f4d9d.tar.xz -> python-rpm-macros-20210131.ec7577b.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-20210112.86f4d9d/README.md new/python-rpm-macros-20210131.ec7577b/README.md --- old/python-rpm-macros-20210112.86f4d9d/README.md 2021-01-12 08:17:34.000000000 +0100 +++ new/python-rpm-macros-20210131.ec7577b/README.md 2021-01-31 21:37:58.000000000 +0100 @@ -77,7 +77,7 @@ * __`%pythons`__ - the build set. See above for details. -* __`%have_<flavor`__. Defined as 1 if the flavor is present in the build environment. +* __`%have_<flavor>`__. Defined as 1 if the flavor is present in the build environment. Undefined otherwise. _Note:_ "present in build environment" does not mean "part of build set". Under some @@ -90,8 +90,13 @@ _Note:_ You do not need to define `%skip_python2` for Tumbleweed. Only define, if you need to skip it for older distributions. -* __`%{python_module modname [= version]}`__ expands to `<flavor>-modname [= version]` for every -flavor. Intended as: `BuildRequires: %{python_module foo}`. +* __`%{python_module modname args}`__ expands to `(<flavor>-modname args)` for every + flavor. Intended as: `BuildRequires: %{python_module foo >= version}`. Supports + [rpm boolean dependencies](https://rpm.org/user_doc/boolean_dependencies.html). + If the package needs a module only for a specific Python version, you can use the special pseudo-macro + `%python` for expansion of the python-flavor within the requirement, e.g. + `BuildRequires: %{python_module python-aiocontextvars >= 0.2.2 if %python-base < 3.7}`. + (Don't define `%python` anywhere else.) * __`%{python_dist_name modname}`__. Given a standardized name (i.e. dist name, name on PyPI) of `modname`, it will convert it to a canonical format. @@ -104,9 +109,10 @@ it will convert it to a canonical format, and evaluates to python3.Ydist(CANONICAL_NAME), which is useful when listing dependencies. Intended as `(Build)Requires: %{python3_dist foo}`. -* __`%python_flavor`__ expands to the `%pythons` entry that is currently being processed. +* __`%python_flavor`__ expands to the `%pythons` entry that is currently being processed. Does not apply in `%prep`, `%build`, `%install` and `%check` sections. For those, check for the -expansion of `$python_` inside the `%python_expand` macro (see below). +pseudo-shell variable expansion of `$python` and `$python_flavor` inside the `%python_expand` macro +(see [Flavor expansion](#flavor-expansion)). * __`%python_subpackages`__ expands to the autogenerated subpackages. This should go at the end of the main headers section. @@ -131,7 +137,7 @@ * __`%if<flavor>`__: applies the following section only to subpackages of that particular flavor. * __`%ifpycache`__: applies the following section only to subpackages of flavors that generate a -`__pycache__` directory. +`__pycache__` directory. * __`%<flavor>_only`__: applies the contents of the line only to subpackages of that particular flavor. @@ -154,27 +160,34 @@ of its arguments for every flavor. Importantly, `$python` is not expanded by the shell, but replaced beforehand for the current flavor, even in macros: - - When used as command delimited by space or one of `"'\)&|;<>`, it is replaced by the path to the executable + - When used as command delimited by space or one of `"'\)&|;<>`, it is replaced by the path to the executable. - When used as part of a macro name or other string, it is replaced by the current flavor name. So: - `%{python_expand $python generatefile.py %{$python_bin_suffix}}` + `%python_expand $python generatefile.py %{$python_sitelib}` expands to: ``` - python2 generatefile.py 2.7 - python3.6 generatefile.py 3.6 - python3.8 generatefile.py 3.8 + python2 generatefile.py /usr/lib/python2.7/site-packages + python3.6 generatefile.py /usr/lib/python3.6/site-packages + python3.8 generatefile.py /usr/lib/python3.8/site-packages ``` etc. (plus the moving around of the `build` directory in between). - If you want to check for the current python flavor inside `%python_expand` use something like + If you want to check for the current python flavor inside `%python_expand`, either use the shell variale + `${python_flavor}` (not `$python_flavor`, `%{python_flavor}` or `%{$python_flavor}`), or append a suffix, + which is not one of the recognized delimiters listed above: ```spec - %{python_expand # + %{python_expand # expanded-body: + if [ ${python_flavor} = python38 ]; then + $python command-for-py-38-only + echo "We have version %{$python_version}, because we are in $python_flavor." + echo "%{$python_flavor} has not enough levels of expansion and %{python_flavor} is always the default." + fi if [ $python_ = python36_ ]; then - $python command-for-py-36-only (we have %{$python_version}) + echo "This also works." fi } ``` @@ -182,9 +195,17 @@ which expands to ```sh - # - if [ python38_ = python36_ ]; then - python3.8 command-for-py-36-only (we have 3.8) + # (.. moving build dirs ..) + python_flavor=python36 + + # expanded-body: + if [ ${python_flavor} = python38 ]; then + python3.6 command-for-py-38-only + echo "We have version 3.6, because we are in python36_flavor." + echo "%{python36_flavor} has not enough levels of expansion and python38 is always the default." + fi + if [ python36_ = python36_ ]; then + echo "This also works." fi ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-20210112.86f4d9d/buildset.in new/python-rpm-macros-20210131.ec7577b/buildset.in --- old/python-rpm-macros-20210112.86f4d9d/buildset.in 2021-01-12 08:17:34.000000000 +0100 +++ new/python-rpm-macros-20210131.ec7577b/buildset.in 2021-01-31 21:37:58.000000000 +0100 @@ -1,9 +1,20 @@ +# buildset.in: prjconf definitions for python-rpm-macros. +# +# This is usually overridden by the distribution's prjconf, landing in ~/.rpmmacros. +# This file provides the default definition from Factory (Tumbleweed) for pure rpmbuild packaging. -# This method for generating python_modules gets too deep to expand at about 5 python flavors. -# It is replaced by a Lua macro in macros.lua -# However, OBS has a much higher expansion depth, so this works fine. -%python_module_iter(a:) %{-a*}-%{args} %{expand:%%{?!python_module_iter_%1:%%{python_module_iter -a %*}}} -%python_module_iter_STOP stop -%python_module() %{expand:%%define args %{**}} %{expand:%%{python_module_iter -a %{pythons} STOP}} +# order of %pythons is important: The last flavor overrides any operation on conflicting files and definitions during expansions, +# making it the "default" in many cases --> keep the primary python3 provider at the end. +%pythons %{?!skip_python3:%{?!skip_python36:python36} %{?!skip_python38:python38}} +%skip_python2 1 +%_without_python2 1 + +# This method for generating python_modules gets too deep to expand for rpm at about 5 python flavors. +# Hence, python_module_iter is replaced by python_module_lua in macros.lua. +# However, OBS cannot expand lua, but has a much higher expansion depth, so this works fine for the server side resolver. +%python_module_iter(a:) %{expand:%%define python %{-a*}} ( %python-%args ) %{expand:%%{?!python_module_iter_%1:%%{python_module_iter -a%*}}%%{?python_module_iter_%1}} +# pseudo-undefine for obs: reset for the next expansion within the next call of python_module +%python_module_iter_STOP %global python %%%%python +%python_module() %{?!python_module_lua:%{expand:%%define args %{**}} %{expand:%%{python_module_iter -a %{pythons} STOP}}}%{?python_module_lua:%python_module_lua %{**}} %add_python() %{expand:%%define pythons %pythons %1} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-20210112.86f4d9d/compile-macros.sh new/python-rpm-macros-20210131.ec7577b/compile-macros.sh --- old/python-rpm-macros-20210112.86f4d9d/compile-macros.sh 2021-01-12 08:17:34.000000000 +0100 +++ new/python-rpm-macros-20210131.ec7577b/compile-macros.sh 2021-01-31 21:37:58.000000000 +0100 @@ -1,11 +1,8 @@ #!/bin/bash -FLAVORS="python2 python3 python36 python38 pypy3" - -# order of BUILDSET is important, it is copied to order of %pythons, -# and that determines the last installed binary -BUILDSET="python2 python3 python36 python38" - +# The set of flavors for which we produce macros. Not identical to +# the buildset predefined for specific distributions (see below) +FLAVORS="python2 python3 python36 python38 python39 pypy3" ### flavor-specific: generate from flavor.in for flavor in $FLAVORS; do @@ -17,13 +14,9 @@ done -### buildset: generate %pythons, %skip_python? and %python_modules -pythons="" -for flavor in $BUILDSET; do - pythons="${pythons} %{?!skip_$flavor:$flavor}" -done -echo "%pythons $pythons" > macros/040-buildset -cat buildset.in >> macros/040-buildset +### buildset: %pythons, %python_module and %add_python, usually overidden +# by the distribution's prjconf +cat buildset.in > macros/040-buildset ### Lua: generate automagic from macros.in and macros.lua diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-20210112.86f4d9d/macros/010-common-defs new/python-rpm-macros-20210131.ec7577b/macros/010-common-defs --- old/python-rpm-macros-20210112.86f4d9d/macros/010-common-defs 2021-01-12 08:17:34.000000000 +0100 +++ new/python-rpm-macros-20210131.ec7577b/macros/010-common-defs 2021-01-31 21:37:58.000000000 +0100 @@ -3,8 +3,8 @@ ##### common functionality ##### -%_python_sysconfig_path() %(%1 -c "import sysconfig as s; print(s.get_paths().get('%2'))") -%_python_sysconfig_var() %(%1 -c "import sysconfig as s; print(s.get_config_var('%2'))") +%_python_sysconfig_path() %([ -x %1 ] && %1 -c "import sysconfig as s; print(s.get_paths().get('%2'))" || echo "!!_%1_not_installed_!!") +%_python_sysconfig_var() %([ -x %1 ] && %1 -c "import sysconfig as s; print(s.get_config_var('%2'))" || echo "!!_%1_not_installed_!!") %_rec_macro_helper %{lua: rpm.define("_rec_macro_helper %{nil}") @@ -143,16 +143,21 @@ ##### PEP-518 macros ##### %pyproject_wheel(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=) %{lua:\ local args = rpm.expand("%**"); \ - local intro = "%{python_expand $python -mpip wheel --no-deps %{?py_setup_args:--build-option %{py_setup_args}}"; \ - intro = intro .. " --disable-pip-version-check --use-pep517 --no-build-isolation --progress-bar off --verbose . "; \ - print(rpm.expand(intro .. args .. "}")) \ + local pyexpandstart = "%{python_expand "; \ + local buildwheel = "$python -mpip wheel --no-deps %{?py_setup_args:--build-option %{py_setup_args}}"; \ + buildwheel = buildwheel .. " --disable-pip-version-check --use-pep517 --no-build-isolation --progress-bar off --verbose . -w build/ "; \ + -- remove abi and platform tags from filename in case the package does define them incorrectly (see PEP427 for valid filenames) \ + -- single percent for shell out of four percent by rpm.expand \ + local renamewheel = "fn=(build/*.whl); mv -n $fn ${fn%%%%-*-*.whl}-none-any.whl"; \ + local pyexpandend = "}"; \ + print(rpm.expand(pyexpandstart .. buildwheel .. args .. "; " .. renamewheel .. pyexpandend)) \ } # No such option: --strip-file-prefix %%{buildroot} %pyproject_install(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=) %{lua:\ local args = rpm.expand("%**"); \ local broot = rpm.expand("--root %buildroot"); \ - local intro = "%{python_expand $python -mpip install " .. broot .. " --disable-pip-version-check --no-compile --no-deps --progress-bar off *.whl "; \ + local intro = "%{python_expand $python -mpip install " .. broot .. " --disable-pip-version-check --no-compile --no-deps --progress-bar off build/*.whl"; \ print(rpm.expand(intro .. args .. "}")) \ print(rpm.expand("%python_compileall")) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-20210112.86f4d9d/macros-default-pythons new/python-rpm-macros-20210131.ec7577b/macros-default-pythons --- old/python-rpm-macros-20210112.86f4d9d/macros-default-pythons 2021-01-12 08:17:34.000000000 +0100 +++ new/python-rpm-macros-20210131.ec7577b/macros-default-pythons 2021-01-31 21:37:58.000000000 +0100 @@ -1,5 +1,6 @@ # this file should be excluded for new distributions, # where %have_$flavor is determined by installed python packages +# (see python-rpm-macros.spec) %have_python2 1 %have_python3 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-20210112.86f4d9d/macros.in new/python-rpm-macros-20210131.ec7577b/macros.in --- old/python-rpm-macros-20210112.86f4d9d/macros.in 2021-01-12 08:17:34.000000000 +0100 +++ new/python-rpm-macros-20210131.ec7577b/macros.in 2021-01-31 21:37:58.000000000 +0100 @@ -10,13 +10,14 @@ %endif %_python_use_flavor() \ -python_flavor=`[ -f _current_flavor ] && cat _current_flavor || true` \ -if [ -z "$python_flavor" ]; then python_flavor="tmp"; fi \ -if [ "$python_flavor" != "%1" ]; then \ - if [ -d build ]; then mv build _build.$python_flavor; fi \ +last_flavor=`[ -f _current_flavor ] && cat _current_flavor || true` \ +if [ -z "$last_flavor" ]; then last_flavor="tmp"; fi \ +if [ "$last_flavor" != "%1" ]; then \ + if [ -d build ]; then mv build _build.$last_flavor; fi \ if [ -d _build.%1 ]; then mv _build.%1 build; fi \ fi \ echo %1 > _current_flavor \ +python_flavor=%1 \ %{nil} %_python_stash_flavor() \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rpm-macros-20210112.86f4d9d/macros.lua new/python-rpm-macros-20210131.ec7577b/macros.lua --- old/python-rpm-macros-20210112.86f4d9d/macros.lua 2021-01-12 08:17:34.000000000 +0100 +++ new/python-rpm-macros-20210131.ec7577b/macros.lua 2021-01-31 21:37:58.000000000 +0100 @@ -52,25 +52,8 @@ flavor = spec_name_prefix end - subpackage_only = rpm.expand("0%{?python_subpackage_only}") ~= "0" - if subpackage_only then - is_called_python = false - modname = "" - end - -- find the spec file specpath = rpm.expand("%_specfile") - - -- search possible locations - shouldn't be necessary anymore --- local locations = { rpm.expand("%_sourcedir"), rpm.expand("%_specdir"), posix.getcwd(), posix.getcwd() .. "/" .. name } --- for _,loc in ipairs(locations) do --- local filename = loc .. "/" .. name .. ".spec" --- if posix.stat(filename, "mode") ~= nil then --- io.stderr:write("could not find spec as " .. filename .. "\n") --- specpath = filename --- break --- end --- end end function python_subpackages() @@ -80,6 +63,12 @@ local current_flavor = flavor local original_flavor = rpm.expand("%python_flavor") + subpackage_only = rpm.expand("%{python_subpackage_only}") == "1" + if subpackage_only then + is_called_python = false + modname = "" + end + -- line processing functions local function print_altered(line) -- set %name macro to proper flavor-name @@ -517,15 +506,23 @@ end end -function python_module() +-- called by %python_module, see buildset.in +function python_module_lua() rpm.expand("%_python_macro_init") local params = rpm.expand("%**") - for _, python in ipairs(pythons) do - if python == "python2" then - print(rpm.expand("%python2_prefix") .. "-" .. params) - else - print(python .. "-" .. params) + -- The Provides: tag does not support boolean dependencies, so only add parens if needed + local lpar = "" + local rpar = "" + local OPERATORS = lookup_table { 'and', 'or', 'if', 'with', 'without', 'unless'} + for p in string.gmatch(params, "%S+") do + if OPERATORS[p] then + lpar = "(" + rpar = ")" + break end - print(" ") + end + for _, python in ipairs(pythons) do + local python_prefix = rpm.expand("%" .. python .. "_prefix") + print(lpar .. python_prefix .. "-" .. string.gsub(params, "%%python", python_prefix) .. rpar .. " ") end end

1 0

commit jupyter for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jupyter for openSUSE:Factory checked in at 2021-02-02 14:24:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jupyter (Old) and /work/SRC/openSUSE:Factory/.jupyter.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jupyter" Tue Feb 2 14:24:30 2021 rev:5 rq:868152 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jupyter/jupyter-filesystem.changes 2019-08-24 18:48:04.741747609 +0200 +++ /work/SRC/openSUSE:Factory/.jupyter.new.28504/jupyter-filesystem.changes 2021-02-02 14:24:37.123293557 +0100 @@ -1,0 +2,8 @@ +Sun Jan 31 00:32:57 UTC 2021 - Benjamin Greiner <code(a)bnavigator.de> + +- BuildRequire python-rpm-macros because the definition from + the prjconfig introduces rich dependencies, which must be + overridden by the lua version. + gh#openSUSE/python-rpm-macros#99 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/jupyter/jupyter.changes 2019-11-29 16:02:48.744808001 +0100 +++ /work/SRC/openSUSE:Factory/.jupyter.new.28504/jupyter.changes 2021-02-02 14:24:37.271293787 +0100 @@ -1,0 +2,9 @@ +Sun Jan 31 00:02:26 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Back to singlespec for multiple python flavors. The primary + python3 flavor provides the "jupyter" package. +- Do what the description advertises and what upstream does: + Require the specified packages +- Update documentation files: jupyter.pdf and jupyter.zip + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jupyter-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.S0F3Ph/_old 2021-02-02 14:24:39.683297539 +0100 +++ /var/tmp/diff_new_pack.S0F3Ph/_new 2021-02-02 14:24:39.683297539 +0100 @@ -1,7 +1,7 @@ # # spec file for package jupyter-filesystem # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 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: jupyter-filesystem -Url: https://jupyter.org/ +URL: https://jupyter.org/ Version: 20190823 Release: 0 %define tar_ver 1.0.0 @@ -29,6 +29,7 @@ Source10: macros.jupyter_core Source11: macros.jupyter_notebook Source12: macros.jupyterlab +BuildRequires: python-rpm-macros %description This package provides common directories and macros used by many ++++++ jupyter.spec ++++++ --- /var/tmp/diff_new_pack.S0F3Ph/_old 2021-02-02 14:24:39.703297570 +0100 +++ /var/tmp/diff_new_pack.S0F3Ph/_new 2021-02-02 14:24:39.703297570 +0100 @@ -1,7 +1,7 @@ # # spec file for package jupyter # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,36 +19,39 @@ Name: jupyter Version: 1.0.0 Release: 0 -Summary: Environment for interactive computing +Summary: Metapackage to install all the Jupyter components in one go License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/jupyter/jupyter Source0: https://files.pythonhosted.org/packages/source/j/jupyter/jupyter-%{version}… Source1: https://buildmedia.readthedocs.org/media/pdf/jupyter/latest/jupyter.pdf Source2: https://buildmedia.readthedocs.org/media/htmlzip/jupyter/latest/jupyter.zip +BuildRequires: %{python_module ipykernel} +BuildRequires: %{python_module ipywidgets} +BuildRequires: %{python_module jupyter-client} +BuildRequires: %{python_module jupyter-core} +BuildRequires: %{python_module jupyter_console} +BuildRequires: %{python_module nbconvert} +BuildRequires: %{python_module notebook} +BuildRequires: %{python_module qtconsole} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: jupyter-ipykernel -BuildRequires: jupyter-ipywidgets -BuildRequires: jupyter-jupyter-client -BuildRequires: jupyter-jupyter-core -BuildRequires: jupyter-jupyter_console -BuildRequires: jupyter-nbconvert -BuildRequires: jupyter-notebook -BuildRequires: jupyter-qtconsole BuildRequires: python-rpm-macros -BuildRequires: python3-setuptools BuildRequires: unzip -Requires: jupyter-jupyter-client -Requires: jupyter-jupyter-core -Recommends: jupyter-ipykernel -Recommends: jupyter-ipywidgets -Recommends: jupyter-jupyter_console -Recommends: jupyter-nbconvert -Recommends: jupyter-notebook -Recommends: jupyter-qtconsole -Provides: python3-jupyter = %{version} -Obsoletes: python3-jupyter <= %{version} +Requires: python-ipykernel +Requires: python-ipywidgets +Requires: python-jupyter-client +Requires: python-jupyter-core +Requires: python-jupyter_console +Requires: python-nbconvert +Requires: python-notebook +Requires: python-qtconsole +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" +Provides: jupyter = %{version}-%{release} +Obsoletes: jupyter < %{version}-%{release} +%endif BuildArch: noarch +%python_subpackages %description Jupyter is an environment for interactive computing in multiple languages. @@ -62,21 +65,20 @@ qtconsole, and the IPython kernel. Additional components and kernels can be installed separately. -%package doc +%package -n jupyter-doc Summary: HTML documentation for %{name} Group: Development/Languages/Python -Provides: %{name}-doc-html = %{version} -Provides: %{name}-doc-pdf = %{version} -Provides: %{python_module %{name}-doc = %{version}} -Provides: %{python_module %{name}-doc-html = %{version}} -Provides: %{python_module %{name}-doc-pdf = %{version}} -# Change from <= to < when (and if) there is a next release after 1.0.0 -Obsoletes: %{name}-doc-html <= %{version} -Obsoletes: %{name}-doc-pdf <= %{version} -Obsoletes: %{python_module %{name}-doc-html <= %{version}} -Obsoletes: %{python_module %{name}-doc-pdf <= %{version}} +Provides: %{name}-doc-html = %{version}-%{release} +Provides: %{name}-doc-pdf = %{version}-%{release} +Provides: %{python_module %{name}-doc = %{version}-%{release}} +Provides: %{python_module %{name}-doc-html = %{version}-%{release}} +Provides: %{python_module %{name}-doc-pdf = %{version}-%{release}} +Obsoletes: %{name}-doc-html < %{version}-%{release} +Obsoletes: %{name}-doc-pdf < %{version}-%{release} +Obsoletes: %{python_module %{name}-doc-html < %{version}-%{release}} +Obsoletes: %{python_module %{name}-doc-pdf < %{version}-%{release}} -%description doc +%description -n jupyter-doc Documentation and help files for %{name}. %prep @@ -86,14 +88,10 @@ rm docs/html/.buildinfo %build -%python3_build +%python_build %install -%python3_install - -# This is provided by jupyter_core now -rm -f %{buildroot}%{python3_sitelib}/jupyter.py* -rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ +%python_install # Install documentation mkdir -p %{buildroot}%{_docdir}/%{name} @@ -103,14 +101,18 @@ %fdupes %{buildroot}%{_docdir}/%{name}/ -%files +%files %python_files %license LICENSE %doc README.md -%{python3_sitelib}/jupyter-%{version}-py*.egg-info +%{python_sitelib}/jupyter-%{version}*-info +# This is provided by jupyter_core now +%exclude %{python_sitelib}/jupyter.py* +%pycache_only %exclude %{python_sitelib}/__pycache__/ -%files doc +%files -n jupyter-doc %license LICENSE %doc README.md +%dir %{_docdir}/%{name}/ %{_docdir}/%{name}/html/ %{_docdir}/%{name}/jupyter.pdf ++++++ jupyter.pdf ++++++ (binary differes) ++++++ jupyter.zip ++++++ Binary files /var/tmp/diff_new_pack.S0F3Ph/_old and /var/tmp/diff_new_pack.S0F3Ph/_new differ

1 0

commit python38 for openSUSE:Factory
by Source-Sync 02 Feb '21

02 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python38 for openSUSE:Factory checked in at 2021-02-02 14:24:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python38 (Old) and /work/SRC/openSUSE:Factory/.python38.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python38" Tue Feb 2 14:24:27 2021 rev:8 rq:868033 version:3.8.7 Changes: -------- --- /work/SRC/openSUSE:Factory/python38/python38.changes 2020-11-29 12:18:43.289413116 +0100 +++ /work/SRC/openSUSE:Factory/.python38.new.28504/python38.changes 2021-02-02 14:24:35.591291174 +0100 @@ -1,0 +2,51 @@ +Fri Jan 29 17:22:48 UTC 2021 - Matej Cepl <mcepl(a)suse.com> + +- Add CVE-2021-3177-buf_ovrfl_PyCArg_repr.patch fixing + bsc#1181126 (CVE-2021-3177) buffer overflow in PyCArg_repr in + _ctypes/callproc.c, which may lead to remote code execution. + +------------------------------------------------------------------- +Tue Jan 5 09:15:36 UTC 2021 - Matej Cepl <mcepl(a)suse.com> + +- (bsc#1180125) We really don't Require python-rpm-macros package. + Unnecessary dependency. + +------------------------------------------------------------------- +Tue Dec 22 08:27:08 UTC 2020 - Matej Cepl <mcepl(a)suse.com> + +- Update to 3.8.7: + - bugfix release + - multiple patches realigned: + - F00102-lib64.patch + - SUSE-FEDORA-multilib.patch + - bpo-31046_ensurepip_honours_prefix.patch + - skip_random_failing_tests.patch + +------------------------------------------------------------------- +Thu Dec 10 00:26:51 UTC 2020 - Benjamin Greiner <code(a)bnavigator.de> + +- Last try before this results in an editwar: + * remove importlib_resources and importlib-metadata + provides/obsoletes + * import importlib_resources is not the same as + import importlib.resources, same for metadata + * The backport packages from PyPI needed for older flavors are + specified as such for setuptools or in pyproject.toml. If a + package requires them they typically add them with a python + version qualifier and the packages have their own version + numbers. + +------------------------------------------------------------------- +Sat Dec 5 16:55:12 UTC 2020 - Matej Cepl <mcepl(a)suse.com> + +- Add patch sphinx-update-removed-function.patch to no longer call + a now removed function and to make documentation build independent of + the Sphinx version (bsc#1179630, gh#python/cpython#13236). + +------------------------------------------------------------------- +Wed Dec 2 10:57:45 UTC 2020 - Matej Cepl <mcepl(a)suse.com> + +- Add importlib_resources provide/obsolete as it is integral + part of the lang since 3.7 release + +------------------------------------------------------------------- Old: ---- Python-3.8.6.tar.xz Python-3.8.6.tar.xz.asc New: ---- CVE-2021-3177-buf_ovrfl_PyCArg_repr.patch Python-3.8.7.tar.xz Python-3.8.7.tar.xz.asc sphinx-update-removed-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python38.spec ++++++ --- /var/tmp/diff_new_pack.NOMg7G/_old 2021-02-02 14:24:36.567292693 +0100 +++ /var/tmp/diff_new_pack.NOMg7G/_new 2021-02-02 14:24:36.571292699 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python38 +# spec file for package python38-core # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -87,7 +87,7 @@ %bcond_without profileopt %endif Name: %{python_pkg_name}%{psuffix} -Version: 3.8.6 +Version: 3.8.7 Release: 0 Summary: Python 3 Interpreter License: Python-2.0 @@ -152,6 +152,11 @@ # PATCH-FIX-UPSTREAM bsc1167501-invalid-alignment.patch gh#python/cpython#19133 mcepl(a)suse.com # Fix wrong misalignment of pointer to vectorcallfunc Patch31: bsc1167501-invalid-alignment.patch +# PATCH-FIX-UPSTREAM stop calling removed Sphinx function gh#python/cpython#13236 +Patch32: sphinx-update-removed-function.patch +# PATCH-FIX-UPSTREAM CVE-2021-3177-buf_ovrfl_PyCArg_repr.patch bsc#1181126 mcepl(a)suse.com +# buffer overflow in PyCArg_repr in _ctypes/callproc.c, which may lead to remote code execution +Patch33: CVE-2021-3177-buf_ovrfl_PyCArg_repr.patch BuildRequires: automake BuildRequires: fdupes BuildRequires: gmp-devel @@ -174,9 +179,11 @@ # Here we just run sphinx and we can use generic one, we don't need # the flavor variant BuildRequires: python3-Sphinx < 3.0 +%if 0%{?suse_version} > 1500 BuildRequires: python3-python-docs-theme BuildRequires: python3-sphinxcontrib-qthelp >= 1.0.2 %endif +%endif %if %{with general} # required for idle3 (.desktop and .appdata.xml files) BuildRequires: appstream-glib @@ -286,7 +293,6 @@ %package -n %{python_pkg_name}-base Summary: Python 3 Interpreter and Stdlib Core Requires: libpython%{so_version} = %{version} -Requires: python-rpm-macros Recommends: %{python_pkg_name} = %{version} #Recommends: python3-ensurepip # python 3.1 didn't have a separate python-base, so it is wrongly @@ -406,6 +412,8 @@ %patch28 -p1 %patch29 -p1 %patch31 -p1 +%patch32 -p1 +%patch33 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ CVE-2021-3177-buf_ovrfl_PyCArg_repr.patch ++++++ From 34df10a9a16b38d54421eeeaf73ec89828563be7 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson <benjamin(a)python.org> Date: Mon, 18 Jan 2021 15:11:46 -0600 Subject: [PATCH] [3.6] closes bpo-42938: Replace snprintf with Python unicode formatting in ctypes param reprs. (GH-24250) (cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7) Co-authored-by: Benjamin Peterson <benjamin(a)python.org> --- Lib/ctypes/test/test_parameters.py | 43 +++++++++++++++ .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst | 2 + Modules/_ctypes/callproc.c | 55 +++++++------------ 3 files changed, 66 insertions(+), 34 deletions(-) create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst --- a/Lib/ctypes/test/test_parameters.py +++ b/Lib/ctypes/test/test_parameters.py @@ -201,6 +201,49 @@ class SimpleTypesTestCase(unittest.TestC with self.assertRaises(ZeroDivisionError): WorseStruct().__setstate__({}, b'foo') + def test_parameter_repr(self): + from ctypes import ( + c_bool, + c_char, + c_wchar, + c_byte, + c_ubyte, + c_short, + c_ushort, + c_int, + c_uint, + c_long, + c_ulong, + c_longlong, + c_ulonglong, + c_float, + c_double, + c_longdouble, + c_char_p, + c_wchar_p, + c_void_p, + ) + self.assertRegex(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$") + self.assertEqual(repr(c_char.from_param(97)), "<cparam 'c' ('a')>") + self.assertRegex(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$") + self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>") + self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>") + self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>") + self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>") + self.assertRegex(repr(c_int.from_param(20000)), r"^<cparam '[li]' $20000$>$") + self.assertRegex(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' $20000$>$") + self.assertRegex(repr(c_long.from_param(20000)), r"^<cparam '[li]' $20000$>$") + self.assertRegex(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' $20000$>$") + self.assertRegex(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' $20000$>$") + self.assertRegex(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' $20000$>$") + self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>") + self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>") + self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>") + self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' $1.5$|'g' at 0x[A-Fa-f0-9]+)>$") + self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' $0x[A-Fa-f0-9]+$>$") + self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' $0x[A-Fa-f0-9]+$>$") + self.assertRegex(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' $0x0*12$>$") + ################################################################ if __name__ == '__main__': --- /dev/null +++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst @@ -0,0 +1,2 @@ +Avoid static buffers when computing the repr of :class:`ctypes.c_double` and +:class:`ctypes.c_longdouble` values. --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -484,58 +484,47 @@ is_literal_char(unsigned char c) static PyObject * PyCArg_repr(PyCArgObject *self) { - char buffer[256]; switch(self->tag) { case 'b': case 'B': - sprintf(buffer, "<cparam '%c' (%d)>", + return PyUnicode_FromFormat("<cparam '%c' (%d)>", self->tag, self->value.b); - break; case 'h': case 'H': - sprintf(buffer, "<cparam '%c' (%d)>", + return PyUnicode_FromFormat("<cparam '%c' (%d)>", self->tag, self->value.h); - break; case 'i': case 'I': - sprintf(buffer, "<cparam '%c' (%d)>", + return PyUnicode_FromFormat("<cparam '%c' (%d)>", self->tag, self->value.i); - break; case 'l': case 'L': - sprintf(buffer, "<cparam '%c' (%ld)>", + return PyUnicode_FromFormat("<cparam '%c' (%ld)>", self->tag, self->value.l); - break; case 'q': case 'Q': - sprintf(buffer, -#ifdef MS_WIN32 - "<cparam '%c' (%I64d)>", -#else - "<cparam '%c' (%lld)>", -#endif + return PyUnicode_FromFormat("<cparam '%c' (%lld)>", self->tag, self->value.q); - break; case 'd': - sprintf(buffer, "<cparam '%c' (%f)>", - self->tag, self->value.d); - break; - case 'f': - sprintf(buffer, "<cparam '%c' (%f)>", - self->tag, self->value.f); - break; - + case 'f': { + PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); + if (f == NULL) { + return NULL; + } + PyObject *result = PyUnicode_FromFormat("<cparam '%c' (%R)>", self->tag, f); + Py_DECREF(f); + return result; + } case 'c': if (is_literal_char((unsigned char)self->value.c)) { - sprintf(buffer, "<cparam '%c' ('%c')>", + return PyUnicode_FromFormat("<cparam '%c' ('%c')>", self->tag, self->value.c); } else { - sprintf(buffer, "<cparam '%c' ('\\x%02x')>", + return PyUnicode_FromFormat("<cparam '%c' ('\\x%02x')>", self->tag, (unsigned char)self->value.c); } - break; /* Hm, are these 'z' and 'Z' codes useful at all? Shouldn't they be replaced by the functionality of c_string @@ -544,22 +533,19 @@ PyCArg_repr(PyCArgObject *self) case 'z': case 'Z': case 'P': - sprintf(buffer, "<cparam '%c' (%p)>", + return PyUnicode_FromFormat("<cparam '%c' (%p)>", self->tag, self->value.p); - break; default: if (is_literal_char((unsigned char)self->tag)) { - sprintf(buffer, "<cparam '%c' at %p>", + return PyUnicode_FromFormat("<cparam '%c' at %p>", (unsigned char)self->tag, (void *)self); } else { - sprintf(buffer, "<cparam 0x%02x at %p>", + return PyUnicode_FromFormat("<cparam 0x%02x at %p>", (unsigned char)self->tag, (void *)self); } - break; } - return PyUnicode_FromString(buffer); } static PyMemberDef PyCArgType_members[] = { ++++++ F00102-lib64.patch ++++++ --- /var/tmp/diff_new_pack.NOMg7G/_old 2021-02-02 14:24:36.607292755 +0100 +++ /var/tmp/diff_new_pack.NOMg7G/_new 2021-02-02 14:24:36.607292755 +0100 @@ -183,7 +183,7 @@ } --- a/configure +++ b/configure -@@ -15214,9 +15214,9 @@ fi +@@ -15233,9 +15233,9 @@ fi if test x$PLATFORM_TRIPLET = x; then @@ -197,7 +197,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -4689,9 +4689,9 @@ fi +@@ -4691,9 +4691,9 @@ fi dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) if test x$PLATFORM_TRIPLET = x; then ++++++ Python-3.8.6.tar.xz -> Python-3.8.7.tar.xz ++++++ /work/SRC/openSUSE:Factory/python38/Python-3.8.6.tar.xz /work/SRC/openSUSE:Factory/.python38.new.28504/Python-3.8.7.tar.xz differ: char 27, line 1 ++++++ SUSE-FEDORA-multilib.patch ++++++ --- /var/tmp/diff_new_pack.NOMg7G/_old 2021-02-02 14:24:36.679292867 +0100 +++ /var/tmp/diff_new_pack.NOMg7G/_new 2021-02-02 14:24:36.683292873 +0100 @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -4686,12 +4686,26 @@ else +@@ -4688,12 +4688,26 @@ else LIBPYTHON='' fi @@ -314,7 +314,7 @@ # just making sure _main() runs and returns things in the stdout --- a/configure +++ b/configure -@@ -15214,9 +15214,9 @@ fi +@@ -15233,9 +15233,9 @@ fi if test x$PLATFORM_TRIPLET = x; then ++++++ bpo-31046_ensurepip_honours_prefix.patch ++++++ --- /var/tmp/diff_new_pack.NOMg7G/_old 2021-02-02 14:24:36.715292923 +0100 +++ /var/tmp/diff_new_pack.NOMg7G/_new 2021-02-02 14:24:36.719292929 +0100 @@ -55,7 +55,7 @@ .. note:: --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py -@@ -56,27 +56,27 @@ def _disable_pip_configuration_settings( +@@ -53,27 +53,27 @@ def _disable_pip_configuration_settings( os.environ['PIP_CONFIG_FILE'] = os.devnull @@ -88,7 +88,7 @@ Note that calling this function will alter both sys.path and os.environ. """ -@@ -119,6 +119,8 @@ def _bootstrap(*, root=None, upgrade=Fal +@@ -116,6 +116,8 @@ def _bootstrap(*, root=None, upgrade=Fal args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir] if root: args += ["--root", root] @@ -97,7 +97,7 @@ if upgrade: args += ["--upgrade"] if user: -@@ -191,6 +193,11 @@ def _main(argv=None): +@@ -188,6 +190,11 @@ def _main(argv=None): help="Install everything relative to this alternate root directory.", ) parser.add_argument( @@ -109,7 +109,7 @@ "--altinstall", action="store_true", default=False, -@@ -209,6 +216,7 @@ def _main(argv=None): +@@ -206,6 +213,7 @@ def _main(argv=None): return _bootstrap( root=args.root, ++++++ skip_random_failing_tests.patch ++++++ --- /var/tmp/diff_new_pack.NOMg7G/_old 2021-02-02 14:24:36.827293097 +0100 +++ /var/tmp/diff_new_pack.NOMg7G/_new 2021-02-02 14:24:36.827293097 +0100 @@ -82,7 +82,7 @@ --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py -@@ -1521,6 +1521,7 @@ class _TestCondition(BaseTestCase): +@@ -1542,6 +1542,7 @@ class _TestCondition(BaseTestCase): success.value = True @unittest.skipUnless(HAS_SHAREDCTYPES, 'needs sharedctypes') @@ -90,7 +90,7 @@ def test_waitfor_timeout(self): # based on test in test/lock_tests.py cond = self.Condition() -@@ -2411,6 +2412,7 @@ class _TestPool(BaseTestCase): +@@ -2432,6 +2433,7 @@ class _TestPool(BaseTestCase): self.assertEqual(get(), 49) self.assertTimingAlmostEqual(get.elapsed, TIMEOUT1) @@ -98,7 +98,7 @@ def test_async_timeout(self): res = self.pool.apply_async(sqr, (6, TIMEOUT2 + 1.0)) get = TimingWrapper(res.get) -@@ -4564,6 +4566,7 @@ class TestWait(unittest.TestCase): +@@ -4643,6 +4645,7 @@ class TestWait(unittest.TestCase): sem.release() time.sleep(period) @@ -108,7 +108,7 @@ --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py -@@ -266,6 +266,7 @@ class EventLoopTestsMixin: +@@ -268,11 +268,12 @@ class EventLoopTestsMixin: # Note: because of the default Windows timing granularity of # 15.6 msec, we use fairly long sleep times here (~100 msec). @@ -116,16 +116,13 @@ def test_run_until_complete(self): t0 = self.loop.time() self.loop.run_until_complete(asyncio.sleep(0.1)) -@@ -293,7 +294,7 @@ class EventLoopTestsMixin: - self.loop.run_forever() - t1 = time.monotonic() - self.assertEqual(results, ['hello world']) + t1 = self.loop.time() - self.assertTrue(0.08 <= t1-t0 <= 0.8, t1-t0) + self.assertTrue(0.08 <= t1-t0 <= 5.0, t1-t0) - def test_call_soon(self): - results = [] -@@ -478,6 +479,7 @@ class EventLoopTestsMixin: + def test_run_until_complete_stopped(self): + +@@ -477,6 +478,7 @@ class EventLoopTestsMixin: self.assertEqual(caught, 1) @unittest.skipUnless(hasattr(signal, 'SIGALRM'), 'No SIGALRM') @@ -135,7 +132,7 @@ caught = 0 --- a/Lib/test/test_buffer.py +++ b/Lib/test/test_buffer.py -@@ -2504,6 +2504,7 @@ class TestBufferProtocol(unittest.TestCa +@@ -2506,6 +2506,7 @@ class TestBufferProtocol(unittest.TestCa a = ndarray(items, shape=[2, 2, 2], format="b") check(memoryview(a), vsize(base_struct + 3 * per_dim)) ++++++ sphinx-update-removed-function.patch ++++++ From 960bb883769e5c64a63b014590d75654db87ffb0 Mon Sep 17 00:00:00 2001 From: Pablo Galindo <Pablogsal(a)gmail.com> Date: Fri, 10 May 2019 22:58:17 +0100 Subject: [PATCH] Fix sphinx deprecation warning about env.note_versionchange() (GH-13236) --- Doc/tools/extensions/pyspecific.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -361,7 +361,12 @@ class DeprecatedRemoved(Directive): translatable=False) node.append(para) env = self.state.document.settings.env - env.get_domain('changeset').note_changeset(node) + # new method + if hasattr(env, 'get_domain'): + env.get_domain('changeset').note_changeset(node) + # deprecated pre-Sphinx-2 method + else: + env.note_versionchange('deprecated', version[0], node, self.lineno) return [node] + messages

1 0