Build without python2 support on suse_version >= 1550 by default

diff --git a/package/libsolv.changes b/package/libsolv.changes
index 6270b61fcbd108f54eb3e1ddebc1ed8a1dd41ef0..b48eb8cfae400a1644ee3e5570bd263823bc7b92 100644 (file)
--- a/package/libsolv.changes
+++ b/package/libsolv.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 30 11:43:29 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- 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/package/libsolv.spec.in b/package/libsolv.spec.in
index 0964ad6bfb0a09bb813c132ce89496ef77ba3974..5e4e30d2d5df2abd5115bfe76c30b653a7ed6f2e 100644 (file)
--- a/package/libsolv.spec.in
+++ b/package/libsolv.spec.in
@@ -1,7 +1,7 @@
 #
 # spec file for package libsolv
 #
-# Copyright (c) 2018 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
@@ -12,9 +12,10 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %define libname libsolv@LIBSOLV_SOVERSION@
 
 %if 0%{?sle_version} >= 120300 || 0%{?suse_version} >= 1330 || !0%{?suse_version}
@@ -37,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
@@ -56,7 +61,7 @@ Release:        0
 Summary:        Package dependency solver using a satisfiability algorithm
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Url:            https://github.com/openSUSE/libsolv
+URL:            https://github.com/openSUSE/libsolv
 Source:         libsolv-%{version}.tar.bz2
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -112,7 +117,6 @@ BuildRequires:  xz-devel
 BuildRequires:  libzstd-devel
 %endif
 
-
 %description
 libsolv is a library for solving packages and reading repositories.
 The solver uses a satisfiability algorithm.