From 44b2bee14ef5fc7ff84356ed5760b91b0948f97f Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Mon, 21 Dec 2009 14:31:15 +0100 Subject: [PATCH] - add sparc support, bump version --- VERSION.cmake | 4 ++-- package/libsatsolver.changes | 9 +++++++++ src/poolarch.c | 10 +++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index bffd437..8739994 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "14") -SET(LIBSATSOLVER_PATCH "11") +SET(LIBSATSOLVER_PATCH "12") -# last released 0.14.11 +# last released 0.14.12 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 480e7cf..86af4c4 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Dec 21 14:29:24 CET 2009 - mls@suse.de + +- disable update rule in noobsoletes case if installed package is to + be kept [bnc#564239] +- work around rpm bug when --prefix is used [bnc#565525] +- add support for sparc architecture [bnc#566291] +- 0.14.12 + +------------------------------------------------------------------- Mon Dec 7 13:59:08 CET 2009 - ma@suse.de - Support optionally compressed product(s).xml in rpmmd metadata. diff --git a/src/poolarch.c b/src/poolarch.c index dffb40b..f75b7bc 100644 --- a/src/poolarch.c +++ b/src/poolarch.c @@ -41,6 +41,9 @@ const char *archpolicies[] = { "sh3", "sh3", "sh4", "sh4", "sh4a", "sh4a:sh4", + "sparcv8", "sparcv8:sparc", + "sparcv9", "sparcv9:sparcv8:sparc", + "sparc64", "sparc64:sparcv9:sparcv8:sparc", 0 }; @@ -48,7 +51,6 @@ void pool_setarch(Pool *pool, const char *arch) { const char *a; - char buf[256]; unsigned int score = 0x10001; size_t l; char d; @@ -82,11 +84,9 @@ pool_setarch(Pool *pool, const char *arch) while (*a) { l = strcspn(a, ":=>"); - if (l && l < sizeof(buf) - 1) + if (l) { - strncpy(buf, a, l); - buf[l] = 0; - id = str2id(pool, buf, 1); + id = strn2id(pool, a, l, 1); if (id > lastarch) { id2arch = sat_realloc(id2arch, (id + 255 + 1) * sizeof(Id)); -- 2.7.4