From 851bdf2be315e84b2ef8f57a09f7a27715f527ad5c2246939cb68a66232cf20d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 21 Jul 2011 11:30:39 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/rpm revision 151.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=a3b647a18f0331ac80bd636c4afeeaf4 --- rpm-python.spec | 2 +- rpm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 8dc5fc7..3aa21c5 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -26,7 +26,7 @@ License: GPLv2+ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.9.1 -Release: 1 +Release: 2 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.spec b/rpm.spec index bbf6025..716132f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.9.1 -Release: 1 +Release: 21 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 From a3955dbd6f9be027513149e082ae5861025b76ff7bb7b7bae3f77eaebda324d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 26 Jul 2011 17:10:05 +0000 Subject: [PATCH 2/2] fix defattr handling for doc files OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=137 --- docdefattr.diff | 35 +++++++++++++++++++++++++++++++++++ rpm.changes | 5 +++++ rpm.spec | 3 ++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 docdefattr.diff diff --git a/docdefattr.diff b/docdefattr.diff new file mode 100644 index 0000000..4335b28 --- /dev/null +++ b/docdefattr.diff @@ -0,0 +1,35 @@ +--- ./build/files.c.orig 2011-07-26 17:08:21.000000000 +0000 ++++ ./build/files.c 2011-07-26 17:08:39.000000000 +0000 +@@ -1735,11 +1735,13 @@ static rpmRC processPackageFiles(rpmSpec + struct FileList_s fl; + const char *fileName; + char buf[BUFSIZ]; +- struct AttrRec_s arbuf; ++ struct AttrRec_s arbuf, def_arbuf; + AttrRec specialDocAttrRec = &arbuf; ++ AttrRec def_specialDocAttrRec = &def_arbuf; + char *specialDoc = NULL; + + nullAttrRec(specialDocAttrRec); ++ nullAttrRec(def_specialDocAttrRec); + pkg->cpioList = NULL; + + if (pkg->fileFile) { +@@ -1877,6 +1879,7 @@ static rpmRC processPackageFiles(rpmSpec + specialDoc = _free(specialDoc); + specialDoc = xstrdup(fileName); + dupAttrRec(&fl.cur_ar, specialDocAttrRec); ++ dupAttrRec(&fl.def_ar, def_specialDocAttrRec); + } else if (fl.currentFlags & RPMFILE_PUBKEY) { + (void) processMetadataFile(pkg, &fl, fileName, RPMTAG_PUBKEYS); + } else { +@@ -1917,7 +1920,9 @@ static rpmRC processPackageFiles(rpmSpec + fl.nLangs = 0; + + dupAttrRec(specialDocAttrRec, &fl.cur_ar); ++ dupAttrRec(def_specialDocAttrRec, &fl.def_ar); + freeAttrRec(specialDocAttrRec); ++ freeAttrRec(def_specialDocAttrRec); + + (void) processBinaryFile(pkg, &fl, specialDoc); + diff --git a/rpm.changes b/rpm.changes index e428882..8708bf3 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 26 19:09:31 CEST 2011 - mls@suse.de + +- fix defattr handling for doc files + ------------------------------------------------------------------- Thu Jul 21 13:00:47 CEST 2011 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 716132f..acc8722 100644 --- a/rpm.spec +++ b/rpm.spec @@ -112,6 +112,7 @@ Patch74: findsupplements.diff Patch75: assumeexec.diff Patch76: buildpipe.diff Patch77: trailslash.diff +Patch78: docdefattr.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -174,7 +175,7 @@ rm -f rpmdb/db.h %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 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 -%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 +%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov