Accepting request 528259 from zypp:Head

Softwarestack update

OBS-URL: https://build.opensuse.org/request/show/528259
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzypp?expand=0&rev=389
This commit is contained in:
Dominique Leuenberger 2017-09-25 11:49:49 +00:00 committed by Git OBS Bridge
commit 2ef79879a8
4 changed files with 14 additions and 6 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e8569737fe23821fe1e137b577aae3b0dda22503b837880c04d7c0a501b573f
size 4704608

3
libzypp-16.17.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3dc74fc02819c33c0dd9580b482af63b1077ce6f54b27050451c219286ae17a6
size 4678868

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 22 12:16:34 CEST 2017 - ma@suse.de
- Default to 'solver.dupAllowVendorChange = false' on SLE15
(FATE#323478)
- Remove unused legacy notify-message script (bsc#1058783)
- version 16.17.1 (0)
-------------------------------------------------------------------
Fri Sep 8 18:05:30 CEST 2017 - ma@suse.de

View File

@ -19,7 +19,7 @@
%define force_gcc_46 0
Name: libzypp
Version: 16.17.0
Version: 16.17.1
Release: 0
Url: git://gitorious.org/opensuse/libzypp.git
Summary: Package, Patch, Pattern, and Product Management
@ -248,8 +248,8 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/lib/zypp
mkdir -p $RPM_BUILD_ROOT%{_var}/log/zypp
mkdir -p $RPM_BUILD_ROOT%{_var}/cache/zypp
%if "%{distribution}" == "openSUSE Tumbleweed"
# Adjust zypp.conf for openSUSE Tumbleweed - minor modifications over the 'usual' defaults - boo#1031756
# Default to 'solver.dupAllowVendorChange = false' on TW and post SLE12
%if 0%{?suse_version} >= 1330 || "%{distribution}" == "openSUSE Tumbleweed"
sed -i "s|# solver.dupAllowVendorChange = true|solver.dupAllowVendorChange = false|g" %{buildroot}%{_sysconfdir}/zypp/zypp.conf
%endif