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

Accepting request 77131 from Base:System

Browse Source 
->

OBS-URL: https://build.opensuse.org/request/show/77131
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=152
This commit is contained in:
Sascha Peilicke 2011-07-27 07:26:33 +00:00 committed by Git OBS Bridge
commit e3986f7afe
3 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
docdefattr.diff Normal file
View File

@ -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);

5
rpm.changes
View File

@ -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

3
rpm.spec
View File

@ -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