From 22ad56dcafeb8e736b0b9290a9ef2c3074a3e0a3eb4bded3260237d93cb6d98e Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 14 Dec 2020 13:21:52 +0000 Subject: [PATCH 1/9] Update to last successful build 774bab5fa13d721aff44e280c17a772a34705cd5 Multicurl backend breaks with with unknown filesize (fixes #277) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2264 --- libzypp-17.25.5.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.25.5.tar.bz2 b/libzypp-17.25.5.tar.bz2 index 5043b71..445abfa 100644 --- a/libzypp-17.25.5.tar.bz2 +++ b/libzypp-17.25.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28f54d3b1a8d152ccf6369e42f7dba2a7ed8282c83651be20b81c2c32ebc4121 -size 4790379 +oid sha256:ae13867aaab1db4da69efeb86c5d109028145ff102f1d730ab344bfcc8873de4 +size 4790450 From db5d479e97332037712525e688ff54f86b57875fd01ccd10006535651f026fab Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 21 Dec 2020 06:35:17 +0000 Subject: [PATCH 2/9] Update to last successful build ba6f0dcaf332ed5ebce281d8eec0514759dbf849 Translated using Weblate (Japanese) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2265 --- libzypp-17.25.5.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.25.5.tar.bz2 b/libzypp-17.25.5.tar.bz2 index 445abfa..10aca5d 100644 --- a/libzypp-17.25.5.tar.bz2 +++ b/libzypp-17.25.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae13867aaab1db4da69efeb86c5d109028145ff102f1d730ab344bfcc8873de4 -size 4790450 +oid sha256:672258b05a26aa874eb02b0529592ef061689ee86c1113e5ca50128e786e31cf +size 4791451 From efcdec633f533ea15b653f1e84d39412bb951b3eda6d9b6a2b3b656eb94c10f0 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 4 Jan 2021 08:53:08 +0000 Subject: [PATCH 3/9] Update to last successful build ba6f0dcaf332ed5ebce281d8eec0514759dbf849 Translated using Weblate (Japanese) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2266 --- libzypp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libzypp.spec b/libzypp.spec index bc1be9a..2bf6cd9 100644 --- a/libzypp.spec +++ b/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 From c11f0affe58ed988dcd99ff93e6770d604268790541900575686c02e79f39afb Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 4 Jan 2021 16:45:42 +0000 Subject: [PATCH 4/9] Update to last successful build fd48dce61313555da4053b16212ee67245a9dc7b Translated using Weblate (Russian) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2267 --- libzypp-17.25.5.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.25.5.tar.bz2 b/libzypp-17.25.5.tar.bz2 index 10aca5d..4b2599c 100644 --- a/libzypp-17.25.5.tar.bz2 +++ b/libzypp-17.25.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:672258b05a26aa874eb02b0529592ef061689ee86c1113e5ca50128e786e31cf -size 4791451 +oid sha256:d32567476e998ce9a2257b0c47ca28386eb9381099532fe43a845e204b47fb14 +size 4789426 From a54b5babedc0bc4f22656c97904fb747eb0891b1a4f284f6e8f7b957e76b9ef4 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 12 Jan 2021 11:56:50 +0000 Subject: [PATCH 5/9] Update to last successful build 6b052f77d2c796c94dec728d7403ab40a6521d2c Fix (bsc#1180721) libgpgme started to return signatures of unknown keys OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2268 --- libzypp-17.25.5.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.25.5.tar.bz2 b/libzypp-17.25.5.tar.bz2 index 4b2599c..e948b8d 100644 --- a/libzypp-17.25.5.tar.bz2 +++ b/libzypp-17.25.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d32567476e998ce9a2257b0c47ca28386eb9381099532fe43a845e204b47fb14 -size 4789426 +oid sha256:4b141036978b246fa4e6341c52485b145e8a37d90579fc658f4e3c715b8b8427 +size 4790140 From a8f233c3f3740f5d5f0a199e42cc3c8eeb63e35d90c62badb02003963477c562 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 12 Jan 2021 16:26:44 +0000 Subject: [PATCH 6/9] Update to last successful build 36ab4cc40655df2abfdb7060f65e428d48a40f47 Rephrase solver problem descriptions (jsc#SLE-8482) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2269 --- libzypp-17.25.5.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.25.5.tar.bz2 b/libzypp-17.25.5.tar.bz2 index e948b8d..1e660be 100644 --- a/libzypp-17.25.5.tar.bz2 +++ b/libzypp-17.25.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b141036978b246fa4e6341c52485b145e8a37d90579fc658f4e3c715b8b8427 -size 4790140 +oid sha256:c1b22b83650b7d3fcfec5c25e06974a498640950b1447faa928ee67c11fda6d5 +size 4791101 From 3c170adfcb85648413abbf1d53e2667b51cc7e42b83a2ac8323f641a0f36db16 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 12 Jan 2021 18:36:40 +0000 Subject: [PATCH 7/9] Update to last successful build 12c3fac87b0270d941fa330068732b5ffbd76802 Translation: updated .pot file OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2270 --- libzypp-17.25.5.tar.bz2 | 4 ++-- libzypp.spec | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libzypp-17.25.5.tar.bz2 b/libzypp-17.25.5.tar.bz2 index 1e660be..7dadca5 100644 --- a/libzypp-17.25.5.tar.bz2 +++ b/libzypp-17.25.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1b22b83650b7d3fcfec5c25e06974a498640950b1447faa928ee67c11fda6d5 -size 4791101 +oid sha256:dc17e63bf1c4142d78b15fd3d4fd2131ca9eeaa541f6d60d2a47962e390a4477 +size 4835796 diff --git a/libzypp.spec b/libzypp.spec index 2bf6cd9..ec5d294 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -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,10 +237,10 @@ 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" -%endif + +%if 0%{?sle_version} == 150300 +export CXXFLAGS="$CXXFLAGS -DZYPPNEWSPPSWENPPYZ" +endif cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DENABLE_BUILD_DOCS=TRUE \ From 2e593b00a9d15b950883367735530cba0d8a62fa1f0cfac3353d88a66a8d4b4a Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 12 Jan 2021 18:53:07 +0000 Subject: [PATCH 8/9] Update to last successful build 558b1c50819822aac6d083a2d15f3cf721a54fb3 changes 17.25.6 (22) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2271 --- libzypp-17.25.5.tar.bz2 | 3 --- libzypp-17.25.6.tar.bz2 | 3 +++ libzypp.changes | 8 ++++++++ libzypp.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 libzypp-17.25.5.tar.bz2 create mode 100644 libzypp-17.25.6.tar.bz2 diff --git a/libzypp-17.25.5.tar.bz2 b/libzypp-17.25.5.tar.bz2 deleted file mode 100644 index 7dadca5..0000000 --- a/libzypp-17.25.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc17e63bf1c4142d78b15fd3d4fd2131ca9eeaa541f6d60d2a47962e390a4477 -size 4835796 diff --git a/libzypp-17.25.6.tar.bz2 b/libzypp-17.25.6.tar.bz2 new file mode 100644 index 0000000..3f41877 --- /dev/null +++ b/libzypp-17.25.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f40289beb6fa215f556348b6d305668e8007e623a6f538ca87a7176d95d1d14d +size 4835858 diff --git a/libzypp.changes b/libzypp.changes index 0b95e8e..b7d372f 100644 --- a/libzypp.changes +++ b/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 diff --git a/libzypp.spec b/libzypp.spec index ec5d294..bbc5266 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -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 From 5e22272a90152ed342e2de36841f532f5d9ad4c348f12df8acba166ba20c2b10 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 12 Jan 2021 19:42:09 +0000 Subject: [PATCH 9/9] Update to last successful build f071bde698ad1cfc489f6cfdcca97fffb605d959 fix spec flie OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2272 --- libzypp-17.25.6.tar.bz2 | 4 ++-- libzypp.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libzypp-17.25.6.tar.bz2 b/libzypp-17.25.6.tar.bz2 index 3f41877..12d3aac 100644 --- a/libzypp-17.25.6.tar.bz2 +++ b/libzypp-17.25.6.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f40289beb6fa215f556348b6d305668e8007e623a6f538ca87a7176d95d1d14d -size 4835858 +oid sha256:b0687cd786883fd0ff596f37ecbc27199b2c957666f3f44fbf07f3e4ae503dfc +size 4836275 diff --git a/libzypp.spec b/libzypp.spec index bbc5266..ac184d7 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -240,7 +240,7 @@ unset EXTRA_CMAKE_OPTIONS %if 0%{?sle_version} == 150300 export CXXFLAGS="$CXXFLAGS -DZYPPNEWSPPSWENPPYZ" -endif +%endif cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DENABLE_BUILD_DOCS=TRUE \