Update to last successful build
8b68e609f85fd9033b815277de2dfbb5164795e3 Allow to disable all WebServer dependent tests OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2179
This commit is contained in:
committed by
Git OBS Bridge
parent
e6971a892c
commit
4c8bb7f093
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:bbf4be33b1a6517039c3b0804be96dc68f1bf2f0a77cbfac7673d954e2f362e2
|
oid sha256:782370d816b98be9278b63b62d083d8243e563148cdf9d2d4d103272401173c3
|
||||||
size 4755336
|
size 4755995
|
||||||
|
@@ -22,6 +22,8 @@
|
|||||||
%bcond_with zchunk
|
%bcond_with zchunk
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%bcond_without mediabackend_tests
|
||||||
|
|
||||||
Name: libzypp
|
Name: libzypp
|
||||||
Version: 17.22.1
|
Version: 17.22.1
|
||||||
Release: 0
|
Release: 0
|
||||||
@@ -89,7 +91,9 @@ BuildRequires: glib2-devel
|
|||||||
BuildRequires: libsigc++2-devel
|
BuildRequires: libsigc++2-devel
|
||||||
|
|
||||||
# required for testsuite
|
# required for testsuite
|
||||||
|
%if %{with mediabackend_tests}
|
||||||
BuildRequires: nginx
|
BuildRequires: nginx
|
||||||
|
%endif
|
||||||
|
|
||||||
Requires: rpm
|
Requires: rpm
|
||||||
|
|
||||||
@@ -109,12 +113,16 @@ BuildRequires: librpm-devel > 4.4
|
|||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
BuildRequires: libgpgme-devel
|
BuildRequires: libgpgme-devel
|
||||||
#testsuite
|
#testsuite
|
||||||
|
%if %{with mediabackend_tests}
|
||||||
BuildRequires: FastCGI-devel
|
BuildRequires: FastCGI-devel
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
BuildRequires: gpgme-devel
|
BuildRequires: gpgme-devel
|
||||||
#testsuite
|
#testsuite
|
||||||
|
%if %{with mediabackend_tests}
|
||||||
BuildRequires: fcgi-devel
|
BuildRequires: fcgi-devel
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%define min_curl_version 7.19.4
|
%define min_curl_version 7.19.4
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@@ -236,6 +244,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
|||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DCMAKE_SKIP_RPATH=1 \
|
-DCMAKE_SKIP_RPATH=1 \
|
||||||
%{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=1} \
|
%{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=1} \
|
||||||
|
%{!?with_mediabackend_tests:-DDISABLE_MEDIABACKEND_TESTS=1} \
|
||||||
${EXTRA_CMAKE_OPTIONS} \
|
${EXTRA_CMAKE_OPTIONS} \
|
||||||
..
|
..
|
||||||
make %{?_smp_mflags} VERBOSE=1
|
make %{?_smp_mflags} VERBOSE=1
|
||||||
|
Reference in New Issue
Block a user