Accepting request 862703 from zypp:Head

Softwarestack update

OBS-URL: https://build.opensuse.org/request/show/862703
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=438

libzypp-17.25.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28f54d3b1a8d152ccf6369e42f7dba2a7ed8282c83651be20b81c2c32ebc4121
-size 4790379

libzypp-17.25.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0687cd786883fd0ff596f37ecbc27199b2c957666f3f44fbf07f3e4ae503dfc
+size 4836275

libzypp.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 12 19:34:03 CET 2021 - ma@suse.de
+
+- Rephrase solver problem descriptions (jsc#SLE-8482)
+- Adapt to changed gpg2/libgpgme behavior (bsc#1180721)
+- Multicurl backend breaks with with unknown filesize (fixes #277)
+- version 17.25.6 (22)
+
 -------------------------------------------------------------------
 Fri Dec 11 16:52:54 CET 2020 - ma@suse.de
 

libzypp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libzypp
 #
-# 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
@@ -31,7 +31,7 @@
 %bcond_without mediabackend_tests
 
 Name:           libzypp
-Version:        17.25.5
+Version:        17.25.6
 Release:        0
 URL:            https://github.com/openSUSE/libzypp
 Summary:        Library for package, patch, pattern and product management
@@ -73,12 +73,9 @@ BuildRequires:  doxygen
 BuildRequires:  gcc-c++ >= 7
 BuildRequires:  gettext-devel
 BuildRequires:  graphviz
+BuildRequires:  libproxy-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  yaml-cpp-devel
-%if 0%{?suse_version} != 1110
-# No libproxy on SLES
-BuildRequires:  libproxy-devel
-%endif
 
 %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
 BuildRequires:  pkgconfig
@@ -240,9 +237,9 @@ cd build
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 unset EXTRA_CMAKE_OPTIONS
-# No libproxy on SLE11
-%if 0%{?suse_version} == 1110
-export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
+
+%if 0%{?sle_version} == 150300
+export CXXFLAGS="$CXXFLAGS -DZYPPNEWSPPSWENPPYZ"
 %endif
 
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \