From a3e525c3c87712aceb1653e4462080012050cc48486f2715e24b39562871a6ce Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 2 Sep 2009 16:05:59 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/rpm revision 86.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=15e4b56637cb8eb79bcd6c523613409f --- allowufdio.diff | 25 +++++++++++++++++++++++++ debuginfo-mono.patch | 22 ++++++++++++++++++++++ fixabsfilelists.diff | 21 +++++++++++++++++++++ fixqueryreturn.diff | 13 +++++++++++++ rpm-python.spec | 2 +- rpm.changes | 14 ++++++++++++++ rpm.spec | 9 +++++++-- 7 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 allowufdio.diff create mode 100644 debuginfo-mono.patch create mode 100644 fixabsfilelists.diff create mode 100644 fixqueryreturn.diff diff --git a/allowufdio.diff b/allowufdio.diff new file mode 100644 index 0000000..471ecc1 --- /dev/null +++ b/allowufdio.diff @@ -0,0 +1,25 @@ +Index: build/pack.c +=================================================================== +--- build/pack.c.orig ++++ build/pack.c +@@ -379,7 +379,9 @@ rpmRC writeRPM(Header *hdrp, unsigned ch + const char *compr = NULL; + headerPutString(h, RPMTAG_PAYLOADFORMAT, "cpio"); + +- if (strcmp(s+1, "gzdio") == 0) { ++ if (strcmp(s+1, "ufdio") == 0) { ++ compr = NULL; ++ } else if (strcmp(s+1, "gzdio") == 0) { + compr = "gzip"; + #if HAVE_BZLIB_H + } else if (strcmp(s+1, "bzdio") == 0) { +@@ -402,7 +404,8 @@ rpmRC writeRPM(Header *hdrp, unsigned ch + goto exit; + } + +- headerPutString(h, RPMTAG_PAYLOADCOMPRESSOR, compr); ++ if (compr) ++ headerPutString(h, RPMTAG_PAYLOADCOMPRESSOR, compr); + buf = xstrdup(rpmio_flags); + buf[s - rpmio_flags] = '\0'; + headerPutString(h, RPMTAG_PAYLOADFLAGS, buf+1); diff --git a/debuginfo-mono.patch b/debuginfo-mono.patch new file mode 100644 index 0000000..32e1bfd --- /dev/null +++ b/debuginfo-mono.patch @@ -0,0 +1,22 @@ +Index: scripts/find-debuginfo.sh +=================================================================== +--- scripts/find-debuginfo.sh.orig ++++ scripts/find-debuginfo.sh +@@ -210,6 +210,17 @@ while read nlinks inum f; do + ;; + *) continue ;; + esac ++ # double check that we really have an ELF file, ++ # to handle monodevelop-debugger-gdb and monodevelop-debugger-mdb ++ ftype=`/usr/bin/file $f | cut -d: -f2-` ++ case $ftype in ++ *ELF*) ;; ++ *) ++ echo "$f is not an ELF file, skipping" ++ continue ++ ;; ++ esac ++ + get_debugfn "$f" + [ -f "${debugfn}" ] && continue + diff --git a/fixabsfilelists.diff b/fixabsfilelists.diff new file mode 100644 index 0000000..6683e06 --- /dev/null +++ b/fixabsfilelists.diff @@ -0,0 +1,21 @@ +Index: build/files.c +=================================================================== +--- build/files.c.orig ++++ build/files.c +@@ -1742,9 +1742,13 @@ static rpmRC processPackageFiles(rpmSpec + + argvSplit(&filelists, getStringBuf(pkg->fileFile), "\n"); + for (fp = filelists; *fp != NULL; fp++) { +- ffn = rpmGetPath("%{_builddir}/", +- (spec->buildSubdir ? spec->buildSubdir : "") , +- "/", *fp, NULL); ++ if (**fp == '/') { ++ ffn = rpmGetPath(*fp, NULL); ++ } else { ++ ffn = rpmGetPath("%{_builddir}/", ++ (spec->buildSubdir ? spec->buildSubdir : "") , ++ "/", *fp, NULL); ++ } + fd = fopen(ffn, "r"); + + if (fd == NULL || ferror(fd)) { diff --git a/fixqueryreturn.diff b/fixqueryreturn.diff new file mode 100644 index 0000000..99bb24c --- /dev/null +++ b/fixqueryreturn.diff @@ -0,0 +1,13 @@ +Index: lib/query.c +=================================================================== +--- lib/query.c.orig ++++ lib/query.c +@@ -283,7 +283,7 @@ static int rpmgiShowMatches(QVA_t qva, r + if (qva->qva_source == RPMQV_DBOFFSET) + break; + } +- return rpmgiNumErrors(gi); ++ return ec + rpmgiNumErrors(gi); + } + + int rpmcliShowMatches(QVA_t qva, rpmts ts) diff --git a/rpm-python.spec b/rpm-python.spec index 5d476be..8d6e6d5 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -25,7 +25,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.7.1 -Release: 2 +Release: 3 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.changes b/rpm.changes index a5089c8..1757171 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 2 17:16:37 CEST 2009 - mls@suse.de + +- allow ufdio payload +- pack db.h include file +- fix abs filelist specification [bnc#535594] +- fix query return value [bnc#527191] + +------------------------------------------------------------------- +Mon Aug 31 18:59:12 UTC 2009 - aj@suse.de + +- Fix debuginfo handling for monodevelop-debugger-gdb and + monodevelop-debugger-mdb packages (bnc#535543). + ------------------------------------------------------------------- Wed Aug 26 14:39:44 CEST 2009 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 44de3e2..d0da9d0 100644 --- a/rpm.spec +++ b/rpm.spec @@ -28,7 +28,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.7.1 -Release: 2 +Release: 3 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -95,6 +95,10 @@ Patch59: disttag-macro.diff Patch60: buildidprov.diff Patch61: debugsubpkg.diff Patch62: debuglink.diff +Patch63: debuginfo-mono.patch +Patch64: allowufdio.diff +Patch65: fixabsfilelists.diff +Patch66: fixqueryreturn.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -154,7 +158,7 @@ rm -f rpmdb/db.h %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 -%patch -P 60 -P 61 -P 62 +%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov @@ -189,6 +193,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/locale ln -s ../share/locale $RPM_BUILD_ROOT/usr/lib/locale make DESTDIR="$RPM_BUILD_ROOT" install install -m 755 convertdb1 $RPM_BUILD_ROOT/usr/lib/rpm +install -m 644 db3/db.h $RPM_BUILD_ROOT/usr/include/rpm # remove .la file and the static variant of libpopt # have to remove the dependency from other .la files as well for f in $RPM_BUILD_ROOT/%{_libdir}/*.la; do