From 5a20a33e2e2e0f4d8606266c52fdce3e134a53bf242bf85e74a0028b22d6b28f Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 15 Sep 2017 09:33:37 +0000 Subject: [PATCH 1/3] Update to last successful build e550d97145dae8e697f70de83827cdcfb9711444 Merge remote-tracking branch 'origin/master' 0e7ed2084c562e00f8dbdd10a8ffae898594907f Remove po files without any translations OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1831 --- libzypp-16.17.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-16.17.0.tar.bz2 b/libzypp-16.17.0.tar.bz2 index 9e298a5..bc94072 100644 --- a/libzypp-16.17.0.tar.bz2 +++ b/libzypp-16.17.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e8569737fe23821fe1e137b577aae3b0dda22503b837880c04d7c0a501b573f -size 4704608 +oid sha256:2cf38c0d07157bfce3ca13aa8c8609ea0afc8585d8fdec138f45b149b28f98d9 +size 4678919 From 10dc49778ac16dcab2eb20ecd9cba2f59ba2312f62c5544fa2d15f86f3213af7 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 15 Sep 2017 11:25:12 +0000 Subject: [PATCH 2/3] Update to last successful build 29e806471f71a0ffbf974d66d12bf4c83d4e9eca Remove unused legacy notify-message script (bsc#1058783) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1832 --- libzypp-16.17.0.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libzypp-16.17.0.tar.bz2 b/libzypp-16.17.0.tar.bz2 index bc94072..bed6343 100644 --- a/libzypp-16.17.0.tar.bz2 +++ b/libzypp-16.17.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf38c0d07157bfce3ca13aa8c8609ea0afc8585d8fdec138f45b149b28f98d9 -size 4678919 +oid sha256:cdd3018811a3270fe8cb9c9d646347fcfec9dc905d7d7fd9fbacba87ca8aadbf +size 4678144 From 415daaa2799ade1c0ae5a03de437d1258788dee5779543f8c1e8741ffc10fd78 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 22 Sep 2017 10:28:13 +0000 Subject: [PATCH 3/3] Update to last successful build 600ec16a6c1a43f914ff3f0f08f219ea308e2eb4 changes 16.17.1 (0) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=1833 --- libzypp-16.17.0.tar.bz2 | 3 --- libzypp-16.17.1.tar.bz2 | 3 +++ libzypp.changes | 8 ++++++++ libzypp.spec | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 libzypp-16.17.0.tar.bz2 create mode 100644 libzypp-16.17.1.tar.bz2 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