From 1a160940f5b5a1d237c51e00c68ef308faf32bb6ee4ad9ef6013e956471354ab Mon Sep 17 00:00:00 2001
From: Michael Andres <ma@suse.com>
Date: Tue, 27 Jul 2010 14:51:04 +0000
Subject: [PATCH] manual submission as hudson is down

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=693
---
 libzypp-7.8.0.tar.bz2 |  3 ---
 libzypp-8.0.1.tar.bz2 |  3 +++
 libzypp.changes       | 16 ++++++++++++++++
 libzypp.spec          |  4 ++--
 4 files changed, 21 insertions(+), 5 deletions(-)
 delete mode 100644 libzypp-7.8.0.tar.bz2
 create mode 100644 libzypp-8.0.1.tar.bz2

diff --git a/libzypp-7.8.0.tar.bz2 b/libzypp-7.8.0.tar.bz2
deleted file mode 100644
index 82e3034..0000000
--- a/libzypp-7.8.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c205c8b646f40d4e1cca977bbb5facc7bd9dc79e65e73c8384ac4c7adc6aa98
-size 4970027
diff --git a/libzypp-8.0.1.tar.bz2 b/libzypp-8.0.1.tar.bz2
new file mode 100644
index 0000000..23e90c0
--- /dev/null
+++ b/libzypp-8.0.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44708e826503c996ef94854f8fbbfd2c9958298df23fa2eae6709cff897f59b1
+size 4967618
diff --git a/libzypp.changes b/libzypp.changes
index 29ec9cf..f9dfc86 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jul 27 15:38:00 CEST 2010 - ma@suse.de
+
+- Fix bug in PoolQuery::addDependency
+- Disable MediaAria and enable MultiCurl as default http/ftp backend.
+  MultiCurl implements MetaLink and Zsync support using libcurl. In 
+  case of trouble set ZYPP_MULTICURL=0 in the envirionment to disable 
+  the new backend.
+- version 8.0.1 (0)
+
+-------------------------------------------------------------------
+Mon Jul 26 17:05:14 CEST 2010 - ma@suse.de
+
+- Bump heads major version after 11.3 branched away.
+- version 8.0.0 (0)
+
 -------------------------------------------------------------------
 Thu Jul 22 01:13:27 CEST 2010 - ma@suse.de
 
diff --git a/libzypp.spec b/libzypp.spec
index 0de6467..5f4fd57 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -15,7 +15,7 @@ License:        GPLv2+
 Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Package, Patch, Pattern, and Product Management
-Version:        7.8.0
+Version:        8.0.1
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
@@ -96,7 +96,7 @@ Conflicts:      aria2 < %{min_aria_version}
 # need CURLOPT_REDIR_PROTOCOLS:
 %define min_curl_version 7.19.4
 # want aria2:
-Requires:       aria2 >= %{min_aria_version}
+Conflicts:      aria2 < %{min_aria_version}
 BuildRequires:  aria2 >= %{min_aria_version}
 %endif
 # ---------------------------------------------------------------