diff --git a/libzypp-16.17.0.tar.bz2 b/libzypp-16.17.0.tar.bz2 deleted file mode 100644 index bed6343..0000000 --- a/libzypp-16.17.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdd3018811a3270fe8cb9c9d646347fcfec9dc905d7d7fd9fbacba87ca8aadbf -size 4678144 diff --git a/libzypp-16.17.1.tar.bz2 b/libzypp-16.17.1.tar.bz2 new file mode 100644 index 0000000..308a4be --- /dev/null +++ b/libzypp-16.17.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc74fc02819c33c0dd9580b482af63b1077ce6f54b27050451c219286ae17a6 +size 4678868 diff --git a/libzypp.changes b/libzypp.changes index 54bfea0..8a02e7f 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -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 diff --git a/libzypp.spec b/libzypp.spec index d32acad..c55eead 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -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