testing/rpm
SHA256
6
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

- update to rpm-4.8.0

Browse Source 
* updated python bindings
  * new transaction ordering code

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=40
This commit is contained in:
Michael Schröder
2010-03-26 10:56:28 +00:00
committed by Git OBS Bridge
parent 3de0fb7483
commit a6846b83ca
30 changed files with 960 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
debugsubpkg.diff
View File

@@ -1,7 +1,5 @@
Index: build/files.c
===================================================================
--- build/files.c.orig
+++ build/files.c
--- ./build/files.c.orig 2010-03-25 15:18:05.000000000 +0000
+++ ./build/files.c 2010-03-25 15:21:26.000000000 +0000
@@ -17,6 +17,10 @@
#include <rpm/rpmfileutil.h> /* rpmDoDigest() */
#include <rpm/rpmlog.h>
@@ -13,7 +11,7 @@ Index: build/files.c
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
#include "rpmio/base64.h"
#include "rpmio/fts.h"
@@ -2220,12 +2224,136 @@ exit:
@@ -2230,12 +2234,136 @@ exit:
return rc;
}
@@ -150,9 +148,9 @@ Index: build/files.c
genSourceRpmName(spec);
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
@@ -2238,8 +2366,109 @@ int processBinaryFiles(rpmSpec spec, int
(void) headerNEVRA(pkg->header, &n, NULL, &v, &r, &a);
rpmlog(RPMLOG_NOTICE, _("Processing files: %s-%s-%s.%s\n"), n, v, r, a);
@@ -2250,8 +2378,110 @@ int processBinaryFiles(rpmSpec spec, int
rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr);
free(nvr);
- if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)) != RPMRC_OK ||
- (rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK)
@@ -162,6 +160,7 @@ Index: build/files.c
+ /* BEGIN DEBUGPKG */
+#if HAVE_GELF_H && HAVE_LIBELF
+ elf_version(EV_CURRENT);
+ a = headerGetString(pkg->header, RPMTAG_ARCH);
+ if (strcmp(a, "noarch") != 0 && strcmp(a, "src") != 0 && strcmp(a, "nosrc") != 0)
+ {
+ Package dbg;
@@ -261,11 +260,9 @@ Index: build/files.c
+ if ((rc = rpmfcGenerateDepends(spec, pkg)) != RPMRC_OK)
goto exit;
if (strcmp(a, "noarch") == 0 && headerGetColor(pkg->header) != 0) {
Index: macros.in
===================================================================
--- macros.in.orig
+++ macros.in
a = headerGetString(pkg->header, RPMTAG_ARCH);
--- ./macros.in.orig 2010-03-25 15:21:20.000000000 +0000
+++ ./macros.in 2010-03-25 15:21:26.000000000 +0000
@@ -176,24 +176,10 @@
# Template for debug information sub-package.
%debug_package \
@@ -291,11 +288,9 @@ Index: macros.in
%description debugsource\
This package provides debug sources for package %{name}.\
Debug sources are useful when developing applications that use this\
Index: scripts/find-debuginfo.sh
===================================================================
--- scripts/find-debuginfo.sh.orig
+++ scripts/find-debuginfo.sh
@@ -274,19 +274,11 @@ while read nlinks inum f; do
--- ./scripts/find-debuginfo.sh.orig 2010-03-25 15:19:04.000000000 +0000
+++ ./scripts/find-debuginfo.sh 2010-03-25 15:21:26.000000000 +0000
@@ -275,19 +275,11 @@ while read nlinks inum f; do
fi
done || exit