diff --git a/libzypp-17.22.1.tar.bz2 b/libzypp-17.22.1.tar.bz2 deleted file mode 100644 index ee64856..0000000 --- a/libzypp-17.22.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8e3deb0ce5ac39843c0bdec63e6552845a6a777ceed27233ec5126d5f9850bc -size 4754455 diff --git a/libzypp-17.23.0.tar.bz2 b/libzypp-17.23.0.tar.bz2 new file mode 100644 index 0000000..73c65c4 --- /dev/null +++ b/libzypp-17.23.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ffee5857999b8693e259693056c928358d04d587c2a4d49aecabf99b26441ec +size 4757940 diff --git a/libzypp.changes b/libzypp.changes index b677d0a..728fbef 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Feb 21 16:06:57 CET 2020 - ma@suse.de + +- Log patch status changes to history (jsc#SLE-5116) +- Allow to disable all WebServer dependent tests when building. OBS + wants to be able to get rid of the nginx/FastCGI-devel build + requirement. Use 'rpmbuild --without mediabackend_tests' or + 'cmake -DDISABLE_MEDIABACKEND_TESTS=1'. +- version 17.23.0 (22) + ------------------------------------------------------------------- Fri Feb 7 14:56:40 CET 2020 - ma@suse.de diff --git a/libzypp.spec b/libzypp.spec index 77875f3..6928557 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -22,8 +22,10 @@ %bcond_with zchunk %endif +%bcond_without mediabackend_tests + Name: libzypp -Version: 17.22.1 +Version: 17.23.0 Release: 0 URL: https://github.com/openSUSE/libzypp Summary: Library for package, patch, pattern and product management @@ -89,7 +91,9 @@ BuildRequires: glib2-devel BuildRequires: libsigc++2-devel # required for testsuite +%if %{with mediabackend_tests} BuildRequires: nginx +%endif Requires: rpm @@ -109,12 +113,16 @@ BuildRequires: librpm-devel > 4.4 %if 0%{?suse_version} BuildRequires: libgpgme-devel #testsuite +%if %{with mediabackend_tests} BuildRequires: FastCGI-devel +%endif %else BuildRequires: gpgme-devel #testsuite +%if %{with mediabackend_tests} BuildRequires: fcgi-devel %endif +%endif %define min_curl_version 7.19.4 %if 0%{?suse_version} @@ -236,6 +244,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=1} \ + %{!?with_mediabackend_tests:-DDISABLE_MEDIABACKEND_TESTS=1} \ ${EXTRA_CMAKE_OPTIONS} \ .. make %{?_smp_mflags} VERBOSE=1