update to rpm-4.9.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
This commit is contained in:
2011-05-16 16:07:44 +00:00
committed by Git OBS Bridge
parent 5d8f14209e
commit cebe6dd1a8
87 changed files with 1633 additions and 2481 deletions

View File

@@ -1,9 +1,7 @@
Patch machine detection code: detect transmeta, rename parisc to hppa. [#52713]
Index: lib/rpmrc.c
===================================================================
--- lib/rpmrc.c.orig
+++ lib/rpmrc.c
--- ./lib/rpmrc.c.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./lib/rpmrc.c 2011-05-11 12:48:02.000000000 +0000
@@ -1,9 +1,6 @@
#include "system.h"
@@ -12,9 +10,9 @@ Index: lib/rpmrc.c
-#include <setjmp.h>
-#endif
#include <ctype.h> /* XXX for /etc/rpm/platform contents */
@@ -784,6 +781,14 @@ static inline int RPMClass(void)
#if HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
@@ -788,6 +785,14 @@ static inline int RPMClass(void)
cpu = (tfms>>8)&15;
@@ -29,7 +27,7 @@ Index: lib/rpmrc.c
sigaction(SIGILL, &oldsa, NULL);
if (cpu < 6)
@@ -920,15 +925,6 @@ static int is_geode()
@@ -924,15 +929,6 @@ static int is_geode()
}
#endif
@@ -45,7 +43,7 @@ Index: lib/rpmrc.c
/**
*/
static void defaultMachine(const char ** arch,
@@ -1055,6 +1051,11 @@ static void defaultMachine(const char **
@@ -1059,6 +1055,11 @@ static void defaultMachine(const char **
/* big endian */
strcpy(un.machine, "mips");
# endif