From 1463309a0776b2e7e759979f6cd4d9891fac01b4a5fff4962ca75800c6c41231 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Mon, 19 Mar 2012 12:15:06 +0000 Subject: [PATCH] Update to last sucessful build 755a6ac1305db623215078f23a637ead8c89799f Add CMake option to disable libproxy usage and disable it on SLE. (bnc#752500) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=871 --- libzypp-11.2.0.tar.bz2 | 4 ++-- libzypp.spec | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libzypp-11.2.0.tar.bz2 b/libzypp-11.2.0.tar.bz2 index f9f6343..54134b7 100644 --- a/libzypp-11.2.0.tar.bz2 +++ b/libzypp-11.2.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6c2df04deb946eae6a909ad47a48b3a41f18f4f739415f0f5272b90b52beae1 -size 4952500 +oid sha256:3b536e5843c2ab5ef98e6a04c8653a14241733e7a7a861ee20f93d7a4f02bddb +size 4953642 diff --git a/libzypp.spec b/libzypp.spec index 27080e1..6ec3242 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -202,10 +202,12 @@ cd build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" unset TRANSLATION_SET +unset EXTRA_CMAKE_OPTIONS # SLE11-* might want its own translation set: %if 0%{?suse_version} == 1110 if [ -f ../po/sle-zypp-po.tar.bz ]; then export TRANSLATION_SET=sle-zypp + export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON" fi %endif cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -214,6 +216,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ -DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \ + ${EXTRA_CMAKE_OPTIONS} \ .. make %{?_smp_mflags} VERBOSE=1 make -C doc/autodoc %{?_smp_mflags}