From d3ab0f09da3f24bef2da55aa4f59d53b50d1f615adc7d505cff0995f745eedd8 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 23 Jan 2020 07:30:46 +0000 Subject: [PATCH 1/4] Update to last successful build cacfabd50daa85137eb0214f1e41e5e820c1d64f Implement SimpleStreambuf and zchunk support OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2164 --- libzypp-17.21.0.tar.bz2 | 4 ++-- libzypp.spec | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libzypp-17.21.0.tar.bz2 b/libzypp-17.21.0.tar.bz2 index e694cbc..a3c2106 100644 --- a/libzypp-17.21.0.tar.bz2 +++ b/libzypp-17.21.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5070a1f81fdac422315aacec28ec963c0a151293abb1b65d78604ea23e8f8a8 -size 4741075 +oid sha256:93273080b6ddcef38b7b821e6d1c116f19375d407cbc63412ea9eb167bc02d06 +size 4744256 diff --git a/libzypp.spec b/libzypp.spec index 26daff8..e090802 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -16,6 +16,12 @@ # +%if 0%{?is_opensuse} && (0%{?sle_version} >= 150000 || 0%{?suse_version} >= 1500) +%bcond_without zchunk +%else +%bcond_with zchunk +%endif + Name: libzypp Version: 17.21.0 Release: 0 @@ -129,6 +135,10 @@ BuildRequires: asciidoc BuildRequires: libxslt-tools %endif +%if %{with zchunk} +BuildRequires: libzck-devel +%endif + %description libzypp is the package management library that powers applications like YaST, zypper and the openSUSE/SLE implementation of PackageKit. @@ -220,6 +230,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB=%{_lib} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ + %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=1} \ ${EXTRA_CMAKE_OPTIONS} \ .. make %{?_smp_mflags} VERBOSE=1 From 0dd145d46c663af95074c384b940ca3cd375e6f51a95deff59aae309a0b5b517 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 23 Jan 2020 12:14:32 +0000 Subject: [PATCH 2/4] Update to last successful build 0298f857ad0300e863bbcf94d5dd07591e66fa9b Remove legacy yum::ResourceType enum OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2165 --- libzypp-17.21.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-17.21.0.tar.bz2 b/libzypp-17.21.0.tar.bz2 index a3c2106..d90ff74 100644 --- a/libzypp-17.21.0.tar.bz2 +++ b/libzypp-17.21.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93273080b6ddcef38b7b821e6d1c116f19375d407cbc63412ea9eb167bc02d06 -size 4744256 +oid sha256:df7df3dcbbf125ff18b4d457123b319edede281aa2683b660323c498a8d0eb18 +size 4725512 From add65667ca9fb28a3c59f9b293ba11556db4f720904b95e47fe01d57870e02fd Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 23 Jan 2020 16:07:58 +0000 Subject: [PATCH 3/4] Update to last successful build d35666aea6bd7bfe026c1fd494caa9566491950c changes 17.22.0 (22) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2166 --- libzypp-17.21.0.tar.bz2 | 3 --- libzypp-17.22.0.tar.bz2 | 3 +++ libzypp.changes | 10 +++++++++- libzypp.spec | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 libzypp-17.21.0.tar.bz2 create mode 100644 libzypp-17.22.0.tar.bz2 diff --git a/libzypp-17.21.0.tar.bz2 b/libzypp-17.21.0.tar.bz2 deleted file mode 100644 index d90ff74..0000000 --- a/libzypp-17.21.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df7df3dcbbf125ff18b4d457123b319edede281aa2683b660323c498a8d0eb18 -size 4725512 diff --git a/libzypp-17.22.0.tar.bz2 b/libzypp-17.22.0.tar.bz2 new file mode 100644 index 0000000..831f305 --- /dev/null +++ b/libzypp-17.22.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adabd08ba294759528cb91395682d11cb6f28d3b74cd9583b8a3ae883ae7bffb +size 4725293 diff --git a/libzypp.changes b/libzypp.changes index b668b67..ab364bd 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,9 +1,17 @@ +------------------------------------------------------------------- +Thu Jan 23 16:30:19 CET 2020 - ma@suse.de + +- yum::Downloader: Prefer zchunk compressed metadata if libvsolv + supports it. +- BuildRequires: libsolv-devel >= 0.7.11. +- version 17.22.0 (22) + ------------------------------------------------------------------- Mon Jan 20 12:53:12 CET 2020 - ma@suse.de - Selectable: Fix highestAvailableVersionObj if only retracted packages are available. Avoid using retracted items as candidate - (jira#SLE-8905) + (jsc#SLE-8770) - version 17.21.0 (20) ------------------------------------------------------------------- diff --git a/libzypp.spec b/libzypp.spec index e090802..c9c9ac7 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -23,7 +23,7 @@ %endif Name: libzypp -Version: 17.21.0 +Version: 17.22.0 Release: 0 Url: https://github.com/openSUSE/libzypp Summary: Library for package, patch, pattern and product management @@ -77,7 +77,7 @@ BuildRequires: pkgconfig BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.7.10 +BuildRequires: libsolv-devel >= 0.7.11 %if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools From 3e59198135416cd631ebdbfe81258073dc2da50a7fd7de358a5cb525c45b29d0 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 23 Jan 2020 17:05:06 +0000 Subject: [PATCH 4/4] Update to last successful build e7c5a78717f97913a3d22555c8235b5985cdb590 Disable zchunk on Leap.15.0 while there is no libzck OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2167 --- libzypp-17.22.0.tar.bz2 | 4 ++-- libzypp.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libzypp-17.22.0.tar.bz2 b/libzypp-17.22.0.tar.bz2 index 831f305..7c11c85 100644 --- a/libzypp-17.22.0.tar.bz2 +++ b/libzypp-17.22.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adabd08ba294759528cb91395682d11cb6f28d3b74cd9583b8a3ae883ae7bffb -size 4725293 +oid sha256:6342eadfbc9f28264a038563d9f125009dc78ce8fbc8ffc0942270202d1ee46f +size 4724466 diff --git a/libzypp.spec b/libzypp.spec index c9c9ac7..53026b8 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -16,7 +16,7 @@ # -%if 0%{?is_opensuse} && (0%{?sle_version} >= 150000 || 0%{?suse_version} >= 1500) +%if 0%{?is_opensuse} && (0%{?sle_version} >= 150100 || 0%{?suse_version} > 1500) %bcond_without zchunk %else %bcond_with zchunk