Skip to content

Commit e24b8bc

Browse files
committed
Build without python2 support on suse_version >= 1550 by default
1 parent e8b564a commit e24b8bc

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

package/libsolv.changes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
-------------------------------------------------------------------
2+
Fri Jul 30 11:43:29 UTC 2021 - Dominique Leuenberger <[email protected]>
3+
4+
- Disable python2 usage on suse_version >= 1550 by default (still
5+
possible to use osc build --with=python).
6+
17
-------------------------------------------------------------------
28
Wed Apr 7 14:56:16 CEST 2021 - [email protected]
39

package/libsolv.spec.in

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# spec file for package libsolv
33
#
4-
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
4+
# Copyright (c) 2021 SUSE LLC
55
#
66
# All modifications and additions to the file contributed by third parties
77
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,10 @@
1212
# license that conforms to the Open Source Definition (Version 1.9)
1313
# published by the Open Source Initiative.
1414

15-
# Please submit bugfixes or comments via http://bugs.opensuse.org/
15+
# Please submit bugfixes or comments via https://bugs.opensuse.org/
1616
#
1717

18+
1819
%define libname libsolv@LIBSOLV_SOVERSION@
1920

2021
%if 0%{?sle_version} >= 120300 || 0%{?suse_version} >= 1330 || !0%{?suse_version}
@@ -37,7 +38,11 @@
3738
# we need at least swig 1.3.40 for the bindings ($typemap support)
3839
%if 0%{?suse_version} != 1110
3940
%bcond_without python3
41+
%if 0%{?suse_version} < 1550
4042
%bcond_without python
43+
%else
44+
%bcond_with python
45+
%endif
4146
%bcond_without ruby
4247
%bcond_without perl
4348
%else
@@ -56,7 +61,7 @@ Release: 0
5661
Summary: Package dependency solver using a satisfiability algorithm
5762
License: BSD-3-Clause
5863
Group: Development/Libraries/C and C++
59-
Url: https://github.com/openSUSE/libsolv
64+
URL: https://github.com/openSUSE/libsolv
6065
Source: libsolv-%{version}.tar.bz2
6166
BuildRequires: cmake
6267
BuildRequires: gcc-c++
@@ -112,7 +117,6 @@ BuildRequires: xz-devel
112117
BuildRequires: libzstd-devel
113118
%endif
114119

115-
116120
%description
117121
libsolv is a library for solving packages and reading repositories.
118122
The solver uses a satisfiability algorithm.

0 commit comments

Comments
 (0)