[meego-commits] 5288: Changes to Trunk:Testing/libsatsolver

[Jan-Simon Möller]

Hi,
I have made the following changes to libsatsolver in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Jan-Simon Möller

[This message was auto-generated]

---

Request #5288:

  submit:   devel:base/libsatsolver(r2) -> Trunk:Testing/libsatsolver


Message:
    Backport from upstream. Make armv7 known to libsatsolver.

State:   new          2010-07-01T03:03:10 jsmoeller
Comment: None



changes files:
--------------
--- libsatsolver.changes
+++ libsatsolver.changes
@@ -0,0 +1,3 @@
+* Thu Jun 24 2010 Jan-Simon Möller <jsmoeller at linuxfoundation.org> - 0.15.0
+- Add libsatsolver-0.15-ARMV7.patch, fixed upstream. BMC#3459
+

new:
----
  libsatsolver-0.15-ARMV7.patch

spec files:
-----------
--- libsatsolver.spec
+++ libsatsolver.spec
@@ -6,6 +6,8 @@
 License:        BSD 3-clause (or similar)
 Url:            git://git.opensuse.org/projects/zypp/sat-solver.git
 Source:         satsolver-%{version}.tar.bz2
+# already fixed upstream
+Patch1:         libsatsolver-0.15-ARMV7.patch
 
 # Patches in upstream
 #Patch100: satsolver-0.14.14-set_thread_count.patch
@@ -115,6 +117,8 @@
 
 %prep
 %setup -q -n satsolver-%{version}
+# already fixed upstream
+%patch1 -p1
 #%patch100 -p1
 #%patch101 -p1
 

other changes:
--------------

++++++ libsatsolver-0.15-ARMV7.patch (new)
--- libsatsolver-0.15-ARMV7.patch
+++ libsatsolver-0.15-ARMV7.patch
+http://gitorious.org/opensuse/sat-solver/commit/d9af474d4602f6908e45e2acd2854fffd7cb22a2.patch
+
+From d9af474d4602f6908e45e2acd2854fffd7cb22a2 Mon Sep 17 00:00:00 2001
+From: Michael Schroeder <mls at suse.de>
+Date: Mon, 17 May 2010 14:37:52 +0200
+Subject: [PATCH] - add armv7l (patch by Jan-Simon Moeller)
+
+---
+ src/poolarch.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/poolarch.c b/src/poolarch.c
+index 6fc254d..3ea4713 100644
+--- a/src/poolarch.c
++++ b/src/poolarch.c
+@@ -31,6 +31,7 @@ const char *archpolicies[] = {
+   "ia64",	"ia64:i686:i586:i486:i386",
+   "ppc64",	"ppc64:ppc",
+   "ppc",	"ppc",
++  "armv7l",	"armv7l:armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
+   "armv6l",	"armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
+   "armv5tejl",	"armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
+   "armv5tel",	"armv5tel:armv5l:armv4tl:armv4l:armv3l",
+-- 
+1.6.1
+