From 521935a68443ecf91c06646ccf632b71d3f364d3d710af54787a9bd4cc6b3f66 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Fri, 27 May 2011 12:17:55 +0000
Subject: [PATCH] Update to last sucessful build

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=774
---
 libzypp-9.2.0.tar.bz2 |  4 ++--
 libzypp.spec          | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/libzypp-9.2.0.tar.bz2 b/libzypp-9.2.0.tar.bz2
index fefba89..4cafdb6 100644
--- a/libzypp-9.2.0.tar.bz2
+++ b/libzypp-9.2.0.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7936de102c365e92dc077249bc37302eca49d33f49b1b6fad3b76d1040f8668
-size 4685890
+oid sha256:12ddb7346320a4e5b3099fd62770e1f05695f69f11bb26faeac5d38608404c6c
+size 4686878
diff --git a/libzypp.spec b/libzypp.spec
index a9e271d..8bc0f09 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -94,15 +94,6 @@ Requires:       gnupg2
 # this check should use 7.19.0 if SLE and 7.19.4 if not (backported
 # CURLOPT_REDIR_PROTOCOLS)
 %define min_curl_version 7.19.0-11.22
-#%define min_curl_version 7.19.4
-%define use_translation_set sle-zypp
-# No requirement, but as we'd use it in case it is present,
-# check for a sufficient version:
-%else
-# Code10 still has this define
-%if 0%{?sles_version}
-%define use_translation_set sle-zypp
-%endif
 %endif
 
 # ---------------------------------------------------------------
@@ -197,12 +188,19 @@ mkdir build
 cd build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
+unset TRANSLATION_SET
+# 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
+fi
+%endif
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DDOC_INSTALL_DIR=%{_docdir} \
       -DLIB=%{_lib} \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_SKIP_RPATH=1 \
-      %{?use_translation_set:-DUSE_TRANSLATION_SET=%use_translation_set} \
+      -DUSE_TRANSLATION_SET=${TRANSLATION_SET:-zypp} \
       ..
 make %{?_smp_mflags} VERBOSE=1
 make -C doc/autodoc %{?_smp_mflags}