folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use addReqProv() for adding package self-provides too 

- We have a function for this stuff so use it. This also ensures
  the per-package rpmds'es and the data in header stay in sync
  and that manually added self-provides wont cause duplicates.
This commit is contained in:
Panu Matilainen 2013-04-16 09:53:58 +03:00
parent 89ff1ca2d9
commit e4b7d44eac
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/parseSpec.c
View File

@ -499,19 +499,17 @@ static void initSourceHeader(rpmSpec spec)
}
/* Add extra provides to package. */
static void addPackageProvides(Header h)
static void addPackageProvides(Package pkg)
{
const char *arch, *name;
char *evr, *isaprov;
rpmsenseFlags pflags = RPMSENSE_EQUAL;
/* <name> = <evr> provide */
name = headerGetString(h, RPMTAG_NAME);
arch = headerGetString(h, RPMTAG_ARCH);
evr = headerGetAsString(h, RPMTAG_EVR);
headerPutString(h, RPMTAG_PROVIDENAME, name);
headerPutString(h, RPMTAG_PROVIDEVERSION, evr);
headerPutUint32(h, RPMTAG_PROVIDEFLAGS, &pflags, 1);
name = headerGetString(pkg->header, RPMTAG_NAME);
arch = headerGetString(pkg->header, RPMTAG_ARCH);
evr = headerGetAsString(pkg->header, RPMTAG_EVR);
addReqProv(pkg, RPMTAG_PROVIDENAME, name, evr, pflags, 0);
/*
* <name>(<isa>) = <evr> provide
@ -520,9 +518,7 @@ static void addPackageProvides(Header h)
*/
isaprov = rpmExpand(name, "%{?_isa}", NULL);
if (!rstreq(arch, "noarch") && !rstreq(name, isaprov)) {
headerPutString(h, RPMTAG_PROVIDENAME, isaprov);
headerPutString(h, RPMTAG_PROVIDEVERSION, evr);
headerPutUint32(h, RPMTAG_PROVIDEFLAGS, &pflags, 1);
addReqProv(pkg, RPMTAG_PROVIDENAME, isaprov, evr, pflags, 0);
}
free(isaprov);
free(evr);
@ -545,7 +541,7 @@ static void addTargets(Package Pkgs)
headerPutString(pkg->header, RPMTAG_OPTFLAGS, optflags);
pkg->ds = rpmdsThis(pkg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL);
addPackageProvides(pkg->header);
addPackageProvides(pkg);
}
free(platform);
free(arch);