]>
Commit | Line | Data |
---|---|---|
80e5119e JR |
1 | --- rpm-5.4.10/build/files.c~ 2013-01-25 13:14:36.692060288 +0100 |
2 | +++ rpm-5.4.10/build/files.c 2013-02-25 12:03:26.110910465 +0100 | |
3 | @@ -1041,7 +1041,6 @@ | |
4 | /* XXX FIXME: this is easy to do as macro expansion */ | |
5 | ||
6 | if (! fl->passedSpecialDoc) { | |
7 | - char *compress_doc; | |
8 | char *mkdir_p; | |
9 | ||
10 | pkg->specialDoc = rpmiobNew(0); | |
11 | @@ -1056,11 +1055,6 @@ | |
12 | mkdir_p = _free(mkdir_p); | |
13 | pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 1); | |
14 | ||
15 | - compress_doc = rpmExpand("%{__compress_doc}", NULL); | |
16 | - if (compress_doc && *compress_doc != '%') | |
17 | - pkg->specialDoc = rpmiobAppend(pkg->specialDoc, compress_doc, 1); | |
18 | - compress_doc = _free(compress_doc); | |
19 | - | |
20 | /*@-temptrans@*/ | |
21 | *fileName = buf; | |
22 | /*@=temptrans@*/ | |
23 | @@ -1071,6 +1065,15 @@ | |
24 | pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "cp -pr ", 0); | |
25 | pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0); | |
26 | pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 1); | |
27 | + | |
28 | + { | |
29 | + char *compress_doc; | |
30 | + | |
31 | + compress_doc = rpmExpand("%{__compress_doc}", NULL); | |
32 | + if (compress_doc && *compress_doc != '%') | |
33 | + pkg->specialDoc = rpmiobAppend(pkg->specialDoc, compress_doc, 1); | |
34 | + compress_doc = _free(compress_doc); | |
35 | + } | |
36 | } | |
37 | } | |
38 |