Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Wed Jul 27 09:26:41 CEST 2011.
-------- --- rpm/rpm.changes 2011-07-21 13:01:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2011-07-26 19:10:04.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 26 19:09:31 CEST 2011 - [email protected] + +- fix defattr handling for doc files + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- docdefattr.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.7A9Wtz/_old 2011-07-27 09:14:54.000000000 +0200 +++ /var/tmp/diff_new_pack.7A9Wtz/_new 2011-07-27 09:14:54.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.9.1 -Release: 2 +Release: 3 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.7A9Wtz/_old 2011-07-27 09:14:54.000000000 +0200 +++ /var/tmp/diff_new_pack.7A9Wtz/_new 2011-07-27 09:14:54.000000000 +0200 @@ -29,7 +29,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.9.1 -Release: 21 +Release: 23 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -112,6 +112,7 @@ Patch75: assumeexec.diff Patch76: buildpipe.diff Patch77: trailslash.diff +Patch78: docdefattr.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -174,7 +175,7 @@ %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 ++++++ docdefattr.diff ++++++ --- ./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); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
