From c3a8988860dd4e9f6e8a8d9c51408787a3ec54eebc931bf451e4a245fb035f9d Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 18 Sep 2020 12:47:40 +0000 Subject: [PATCH] Update to last successful build c1593e331ee527b6e0e4d369f1f15c2b70cdb74b Link against libzsd to close libsolvs open references (as we link statically) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2231 --- libzypp-17.24.2.tar.bz2 | 4 ++-- libzypp.spec | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libzypp-17.24.2.tar.bz2 b/libzypp-17.24.2.tar.bz2 index eb96a95..3fb133f 100644 --- a/libzypp-17.24.2.tar.bz2 +++ b/libzypp-17.24.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5c2bd3d23e6aef29d8d15d7ff890a5671c215ff16ac6068dd04e3718291a8d1 -size 4776054 +oid sha256:a0e9853272ea512daf085daa399429fee160a43068a1d35b95ab2e018ad32832 +size 4777303 diff --git a/libzypp.spec b/libzypp.spec index 9c2579a..065111d 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -21,6 +21,12 @@ %else %bcond_with zchunk %endif +# libsolvs external references require us to link against it: +%if 0%{?sle_version} >= 150000 || 0%{?suse_version} >= 1500 +%bcond_without zstd +%else +%bcond_with zstd +%endif %bcond_without mediabackend_tests @@ -152,6 +158,9 @@ BuildRequires: libxslt-tools %if %{with zchunk} BuildRequires: libzck-devel %endif +%if %{with zstd} +BuildRequires: libzstd-devel +%endif %description libzypp is the package management library that powers applications @@ -245,6 +254,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=1} \ + %{?with_zstd:-DENABLE_ZSTD_COMPRESSION=1} \ %{!?with_mediabackend_tests:-DDISABLE_MEDIABACKEND_TESTS=1} \ ${EXTRA_CMAKE_OPTIONS} \ ..