From ab7fd762d8006528545c969c4ac0f8d1fd835dc53e25cc22772fde57332c9454 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Tue, 4 Feb 2020 16:53:29 +0000 Subject: [PATCH] Update to last successful build 665b65db202cc552826ffcb36801434d50add69e Detect if nginx and libfcgi are available OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2171 --- libzypp-17.22.0.tar.bz2 | 4 ++-- libzypp.spec | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libzypp-17.22.0.tar.bz2 b/libzypp-17.22.0.tar.bz2 index abd5f95..70d61b9 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:00a07cb970673c51231d0bbd783be9ca52237d8db61a7afd82a8583aa46916d2 -size 4725372 +oid sha256:003395a906c3751488bc3ab4c148b3baf0e06ec245964bd9b2b824d5090da87d +size 4752935 diff --git a/libzypp.spec b/libzypp.spec index 53026b8..fb29f4b 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -85,8 +85,11 @@ BuildRequires: libsolv-tools Requires: libsolv-tools %endif -# required for testsuite, webrick -BuildRequires: ruby +BuildRequires: glib2-devel +BuildRequires: libsigc++2-devel + +# required for testsuite +BuildRequires: nginx Requires: rpm @@ -95,20 +98,22 @@ BuildRequires: rpm-devel > 4.4 %endif %if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 -BuildRequires: glib2-devel BuildRequires: popt-devel BuildRequires: rpm-devel > 4.4 %endif %if 0%{?mandriva_version} -BuildRequires: glib2-devel BuildRequires: librpm-devel > 4.4 %endif %if 0%{?suse_version} BuildRequires: libgpgme-devel +#testsuite +BuildRequires: FastCGI-devel %else BuildRequires: gpgme-devel +#testsuite +BuildRequires: fcgi-devel %endif %define min_curl_version 7.19.4 @@ -273,7 +278,7 @@ cd .. %check pushd build/tests -LD_LIBRARY_PATH="%{buildroot}/%{_libdir}:$LD_LIBRARY_PATH" ctest --output-on-failure . +LD_LIBRARY_PATH="$(pwd)/../zypp:$LD_LIBRARY_PATH" ctest --output-on-failure . popd %post