From 389fe37b910baa1da80183658b65bb8f8366dc7a3eae117fef6e1d14c39a4e62 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Thu, 8 Dec 2011 11:27:09 +0000 Subject: [PATCH 1/2] Update to last sucessful build d8ff9104f9c2c1702777db4d6289358bf36d773c Set min_curl_version 7.19.4 (bnc#735284) OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=847 --- libzypp-10.3.5.tar.bz2 | 4 ++-- libzypp.spec | 15 +-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/libzypp-10.3.5.tar.bz2 b/libzypp-10.3.5.tar.bz2 index 4730b33..1aecf65 100644 --- a/libzypp-10.3.5.tar.bz2 +++ b/libzypp-10.3.5.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:386cbee86a5cffa49c87005620730ff10d5d86b775e731c81d10e6acf857eb44 -size 5019108 +oid sha256:24c9b66af702604e256e89f14ba126004636d8158e0993a4c8776ef863a85f42 +size 5018861 diff --git a/libzypp.spec b/libzypp.spec index 5015107..a6f2aa3 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -104,20 +104,7 @@ Requires: gpg2 Requires: gnupg2 %endif -# --------------------------------------------------------------- -%if 0%{?suse_version} >= 1110 -# (almost) common codebase, but on SLES11-SP1 (according to Rudi -# suse_version == 1110) we have a patched libcurl-7.19.0-11.22, -# and no aria2. Furthermore SLE may use it's own set of .po files -# from po/sle-zypp-po.tar.bz2. - -# 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 -%endif - -# --------------------------------------------------------------- - +%define min_curl_version 7.19.4 %if 0%{?suse_version} %if 0%{?suse_version} >= 1100 # Code11+ From 62b61127838f9357e037614bd9fa8e7891f84854576a86d8d8324f6ac29a1c06 Mon Sep 17 00:00:00 2001 From: ZYpp Developers Date: Fri, 23 Dec 2011 14:07:18 +0000 Subject: [PATCH 2/2] Update to last sucessful build 3df0762284eaa929cb283fcbd7c7f4fd602f4e70 let mkChangelog ignore untacked files OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=848 --- libzypp-10.3.5.tar.bz2 | 3 --- libzypp-11.0.0.tar.bz2 | 3 +++ libzypp.changes | 10 ++++++++++ libzypp.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 libzypp-10.3.5.tar.bz2 create mode 100644 libzypp-11.0.0.tar.bz2 diff --git a/libzypp-10.3.5.tar.bz2 b/libzypp-10.3.5.tar.bz2 deleted file mode 100644 index 1aecf65..0000000 --- a/libzypp-10.3.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24c9b66af702604e256e89f14ba126004636d8158e0993a4c8776ef863a85f42 -size 5018861 diff --git a/libzypp-11.0.0.tar.bz2 b/libzypp-11.0.0.tar.bz2 new file mode 100644 index 0000000..b92988f --- /dev/null +++ b/libzypp-11.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f707bac12a0dac21991c47203678b3cebfab944a0e7119e83c04b0de6b6104db +size 5019213 diff --git a/libzypp.changes b/libzypp.changes index ea10397..9449729 100644 --- a/libzypp.changes +++ b/libzypp.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 23 14:51:25 CET 2011 - ma@suse.de + +- Adapt Repository iteration to libsolv changes. +- Add sat::Pool tests +- Fix Flags<> api to be more consistent and add testcase. +- Set min_curl_version 7.19.4 (bnc#735284) +- Doc: add some words about 'Solver - Vendor protection' +- version 11.0.0 (0) + ------------------------------------------------------------------- Thu Dec 1 01:13:37 CET 2011 - ma@suse.de diff --git a/libzypp.spec b/libzypp.spec index a6f2aa3..b9c8155 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -23,7 +23,7 @@ License: GPLv2+ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 10.3.5 +Version: 11.0.0 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc