diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2019-10-04 13:01:11 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2019-11-18 12:46:29 +0200 |
| commit | ebbad2909465707258962850547699d6cb0c6d83 (patch) | |
| tree | e77fd5b1677b677709ee3da3303ecb5f889f8b0f | |
| parent | bbe36da6c9b9f8e54697d9412a9417d058838811 (diff) | |
| download | rpm-ebbad2909465707258962850547699d6cb0c6d83.tar.gz | |
Mark dynamically generated buildrequires autogenerated
This makes them in line with regular auto-generated dependencies and allows
them to be easily identified. It also makes parseRCPOT() error reporting
do the right thing: generated dependencies do not relate to spec lines.
Fixes #801 (also reported as RhBug:1759100)
(cherry picked from commit bee5dc94cf6ee388be821625ba77034bce61c049)
| -rw-r--r-- | build/build.c | 2 | ||||
| -rw-r--r-- | tests/rpmbuild.at | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/build/build.c b/build/build.c index 08c2df1e4..04c59ad5b 100644 --- a/build/build.c +++ b/build/build.c @@ -201,7 +201,7 @@ static int doBuildRequires(rpmSpec spec, int test) for (int i = 0; i < outc; i++) { parseRCPOT(spec, spec->sourcePackage, output[i], RPMTAG_REQUIRENAME, - 0, 0, addReqProvPkg, NULL); + 0, RPMSENSE_FIND_REQUIRES, addReqProvPkg, NULL); } rpmdsPutToHeader( diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at index baf556677..009b71cc0 100644 --- a/tests/rpmbuild.at +++ b/tests/rpmbuild.at @@ -1603,16 +1603,16 @@ cp "${abs_srcdir}"/data/SOURCES/buildrequires-1.0.tar.gz ${TOPDIR}/SOURCES run rpmbuild \ -br --quiet --nodeps "${abs_srcdir}"/data/SPECS/buildrequires.spec -runroot rpm -qpR /build/SRPMS/buildrequires-1.0-1.buildreqs.nosrc.rpm +runroot rpm -qpvR /build/SRPMS/buildrequires-1.0-1.buildreqs.nosrc.rpm ], [0], -[(bar = 3.4 or bar = 3.5) -foo > 1.3 -foo-bar = 2.0 -rpmlib(CompressedFileNames) <= 3.0.4-1 -rpmlib(DynamicBuildRequires) <= 4.15.0-1 -rpmlib(FileDigests) <= 4.6.0-1 -rpmlib(RichDependencies) <= 4.12.0-1 +[auto: (bar = 3.4 or bar = 3.5) +auto: foo > 1.3 +auto: foo-bar = 2.0 +rpmlib: rpmlib(CompressedFileNames) <= 3.0.4-1 +rpmlib: rpmlib(DynamicBuildRequires) <= 4.15.0-1 +rpmlib: rpmlib(FileDigests) <= 4.6.0-1 +rpmlib: rpmlib(RichDependencies) <= 4.12.0-1 ], [ignore]) AT_CLEANUP |