From 9cf2c415055ef8f4c3efff11769812dd701fe7f4351ab2138f053cd30417f670 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 30 Jul 2021 14:19:20 +0000 Subject: [PATCH] Update to last successful build 06a546849778a1e27d78ad93fa337a5088c8ce2d Merge pull request #466 from DimStar77/TW_sans_py2 e24b8bcb83f37727352ccd9504b6ebf6d91077bc Build without python2 support on suse_version >= 1550 by default OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libsolv?expand=0&rev=1155 --- libsolv-0.7.19.tar.bz2 | 4 ++-- libsolv.changes | 6 ++++++ libsolv.spec | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libsolv-0.7.19.tar.bz2 b/libsolv-0.7.19.tar.bz2 index 71c7978..14ef8f6 100644 --- a/libsolv-0.7.19.tar.bz2 +++ b/libsolv-0.7.19.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfb80d7f13d54aacc15767cfafa14b9a920ef3de611c5e109f4b78910e7cb3d7 -size 575920 +oid sha256:0cfc8969ff6cf055f38184f381bf1eae28158b40de089aaae920fb27c5be8434 +size 575898 diff --git a/libsolv.changes b/libsolv.changes index 2af50fb..c366b26 100644 --- a/libsolv.changes +++ b/libsolv.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 30 11:43:29 UTC 2021 - Dominique Leuenberger + +- Disable python2 usage on suse_version >= 1550 by default (still + possible to use osc build --with=python). + ------------------------------------------------------------------- Wed Apr 7 14:56:16 CEST 2021 - mls@suse.de diff --git a/libsolv.spec b/libsolv.spec index 4ad79f3..0d02d74 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -38,7 +38,11 @@ # we need at least swig 1.3.40 for the bindings ($typemap support) %if 0%{?suse_version} != 1110 %bcond_without python3 +%if 0%{?suse_version} < 1550 %bcond_without python +%else +%bcond_with python +%endif %bcond_without ruby %bcond_without perl %else