- update to rpm-4.10.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=213
This commit is contained in:
2012-08-28 13:31:44 +00:00
committed by Git OBS Bridge
parent 2995f03e34
commit ff04a9b972
42 changed files with 814 additions and 2391 deletions

View File

@@ -1,19 +1,19 @@
Create a debuginfo package for each subpackage.
--- ./build/files.c.orig 2011-05-13 15:34:01.000000000 +0000
+++ ./build/files.c 2011-05-13 15:35:42.000000000 +0000
@@ -20,6 +20,10 @@
#include <rpm/rpmfileutil.h> /* rpmDoDigest() */
--- ./build/files.c.orig 2012-06-01 13:13:45.000000000 +0000
+++ ./build/files.c 2012-06-01 13:14:18.000000000 +0000
@@ -21,6 +21,10 @@
#include <rpm/rpmlog.h>
#include <rpm/rpmbase64.h>
+#if HAVE_GELF_H
+#include <gelf.h>
+#endif
+
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
#include "rpmio/base64.h"
#include "misc/fts.h"
@@ -2105,13 +2109,237 @@ exit:
#include "lib/cpio.h"
@@ -2097,13 +2101,237 @@ exit:
return rc;
}
@@ -251,7 +251,7 @@ Create a debuginfo package for each subpackage.
genSourceRpmName(spec);
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
@@ -2127,8 +2355,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r
@@ -2119,8 +2347,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r
rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr);
free(nvr);
@@ -266,9 +266,9 @@ Create a debuginfo package for each subpackage.
goto exit;
a = headerGetString(pkg->header, RPMTAG_ARCH);
--- ./macros.in.orig 2011-05-13 15:34:01.000000000 +0000
+++ ./macros.in 2011-05-13 15:34:10.000000000 +0000
@@ -179,24 +179,10 @@
--- ./macros.in.orig 2012-06-01 13:13:45.000000000 +0000
+++ ./macros.in 2012-06-01 13:14:18.000000000 +0000
@@ -182,24 +182,10 @@
# Template for debug information sub-package.
%debug_package \
%global __debug_package 1\
@@ -293,15 +293,15 @@ Create a debuginfo package for each subpackage.
%description debugsource\
This package provides debug sources for package %{name}.\
Debug sources are useful when developing applications that use this\
--- ./scripts/find-debuginfo.sh.orig 2011-05-13 15:34:01.000000000 +0000
+++ ./scripts/find-debuginfo.sh 2011-05-13 15:34:10.000000000 +0000
@@ -277,19 +277,11 @@ while read nlinks inum f; do
--- ./scripts/find-debuginfo.sh.orig 2012-06-01 13:13:45.000000000 +0000
+++ ./scripts/find-debuginfo.sh 2012-06-01 13:15:56.000000000 +0000
@@ -311,19 +311,11 @@ while read nlinks inum f; do
fi
done || exit
-# For each symlink whose target has a .debug file,
-# make a .debug symlink to that file.
-find $RPM_BUILD_ROOT ! -path "${debugdir}/*" -type l -print |
-find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print |
-while read f
-do
- t=$(readlink -m "$f").debug