| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | rpmfc.c: Always generate per-file information |
| 2 | |
| 3 | Even when the per-file dependency generate is disabled, we want to generate |
| 4 | per file classification and other associated data. |
| 5 | |
| 6 | Note: this is a temporary workaround. Eventually we will want to have a way |
| 7 | to seed per-file dependency and other information in order to generate a |
| 8 | package from previously determined information. |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 13 | |
| 14 | Index: rpm-5.4.14/lib/rpmfc.c |
| 15 | =================================================================== |
| 16 | --- rpm-5.4.14.orig/lib/rpmfc.c |
| 17 | +++ rpm-5.4.14/lib/rpmfc.c |
| 18 | @@ -1734,7 +1734,6 @@ rpmRC rpmfcGenerateDepends(void * _spec, |
| 19 | /* ... then generate dependencies using %{__find_requires} et al. */ |
| 20 | rc = rpmfcGenerateDependsHelper(spec, pkg, fi); |
| 21 | printDeps(pkg->header); |
| 22 | - return rc; |
| 23 | } |
| 24 | |
| 25 | /* Generate scriptlet Dependencies. */ |
| 26 | @@ -1762,8 +1761,8 @@ rpmRC rpmfcGenerateDepends(void * _spec, |
| 27 | av[ac] = NULL; |
| 28 | |
| 29 | fc = rpmfcNew(); |
| 30 | - fc->skipProv = !pkg->autoProv; |
| 31 | - fc->skipReq = !pkg->autoReq; |
| 32 | + fc->skipProv = !pkg->autoProv || !internaldeps; |
| 33 | + fc->skipReq = !pkg->autoReq || !internaldeps; |
| 34 | fc->tracked = 0; |
| 35 | |
| 36 | { const char * buildRootURL; |