From: Michael Andres <ma@suse.de>
Date: Tue, 27 Jul 2010 14:21:09 +0000 (+0200)
Subject: Fix evaluation of package specs containing edition or arch (bnc#624320)
X-Git-Tag: 1.4.7~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae974f37bb4161011c462e60a16c3d8251eee301;p=platform%2Fupstream%2Fzypper.git

Fix evaluation of package specs containing edition or arch (bnc#624320)
---

diff --git a/src/misc.cc b/src/misc.cc
index e709501..bbb8d3a 100644
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -462,14 +462,15 @@ pkg_spec_to_poolquery(const Capability & cap, const list<string> & repos)
 
   PoolQuery q;
   q.addKind(splid.kind());
-  q.addAttribute(sat::SolvAttr::name, splid.name().asString());
   q.setMatchGlob();
   for_(it, repos.begin(), repos.end())
     q.addRepo(*it);
-  if (cap.detail().hasArch())
-    q.addAttribute(sat::SolvAttr::arch, cap.detail().arch().asString());
-  if (cap.detail().isVersioned())
-    q.setEdition(cap.detail().ed(), cap.detail().op());
+  q.addDependency( sat::SolvAttr::name, splid.name().asString(),
+		   // only package names (no provides)
+		   cap.detail().op(), cap.detail().ed(),
+		   // defaults to Rel::ANY (NOOP) if no versioned cap
+		   Arch( cap.detail().arch() ) );
+		   // defaults Arch_empty (NOOP) if no arch in cap
 
   DBG << "query: " << q << endl;
 
diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index c2eef59..c1cd609 100644
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           @PACKAGE@
-BuildRequires:  libzypp-devel >= 7.6.0
+BuildRequires:  libzypp-devel >= 8.0.1
 BuildRequires:  boost-devel >= 1.33.1
 BuildRequires:  gettext-devel >= 0.15
 BuildRequires:  readline-devel >= 5.1