pool/libzypp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to last successful build

Browse Source 
329360e581a1282e82e0440a75d4d1338ff7787e SLE-12 (suse_version 1315) uses it's own translations set (bnc#897176)

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1128
This commit is contained in:
ZYpp Developers 2014-09-18 13:47:38 +00:00 committed by Git OBS Bridge
parent 2f6fa61ee7
commit 3fc54302e2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libzypp-14.29.1.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:189d3bde12c33b9405f1a04f0e481a4f3efe583725f3b0072461d7e731501fcd oid sha256:0610041c809381f05a07c05881a8974c8a4ce76d6a11c9b7c82a030adaeeadb1
size 4606067 size 4434616

13
libzypp.spec
View File

@ -209,13 +209,20 @@ export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS"
unset TRANSLATION_SET unset TRANSLATION_SET
unset EXTRA_CMAKE_OPTIONS unset EXTRA_CMAKE_OPTIONS
# SLE11-* might want its own translation set: +# Same codebase, but SLES may use it's own translation set.
%if 0%{?suse_version} == 1110 +# suse_version
+# 1110 SLES11
+# 1315 SLES12
%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
if [ -f ../po/sle-zypp-po.tar.bz ]; then if [ -f ../po/sle-zypp-po.tar.bz ]; then
export TRANSLATION_SET=sle-zypp export TRANSLATION_SET=sle-zypp
export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
fi fi
%endif %endif
# No libproxy on SLE11
%if 0%{?suse_version} == 1110
export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
%endif
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DDOC_INSTALL_DIR=%{_docdir} \ -DDOC_INSTALL_DIR=%{_docdir} \
-DLIB=%{_lib} \ -DLIB=%{_lib} \