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

Special case of "/" in %files was broken. 

Don't freeMacros in freeSpec -- macros have been globalized.
Remove extra debugging '_' prefix.

CVS patchset: 2220
CVS date: 1998/08/02 13:48:37
This commit is contained in:
jbj 1998-08-02 13:48:37 +00:00
parent c8271be9c7
commit 12c5bea4d8
4 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,4 +1,5 @@
2.5.3 -> 2.9
- add special case code for "/" in %files.
- preliminary macro invironment as side effect of rpmrc parse.
- macro handling in rpmlib -- rework include: tag with macro expansion.
- first attempt at librpmbuild API.

22
build/files.c
View File

@ -845,6 +845,11 @@ static int addFile(struct FileList *fl, char *name, struct stat *statp)
strcpy(diskName, fileName);
if (fl->buildRoot) {
strcpy(fileName, diskName + strlen(fl->buildRoot));
/* Special case for "/" */
if (*fileName == '\0') {
fileName[0] = '/';
fileName[1] = '\0';
}
}
} else {
if (fl->buildRoot) {
@ -1270,8 +1275,7 @@ int processSourceFiles(Spec spec)
/* Construct the file list and source entries */
appendLineStringBuf(sourceFiles, spec->specFile);
srcPtr = spec->sources;
while (srcPtr) {
for (srcPtr = spec->sources; srcPtr != NULL; srcPtr = srcPtr->next) {
if (srcPtr->flags & RPMBUILD_ISSOURCE) {
headerAddOrAppendEntry(spec->sourceHeader, RPMTAG_SOURCE,
RPM_STRING_ARRAY_TYPE, &srcPtr->source, 1);
@ -1292,20 +1296,15 @@ int processSourceFiles(Spec spec)
srcPtr->flags & RPMBUILD_ISNO ? "!" : "",
rpmGetVar(RPMVAR_SOURCEDIR), srcPtr->source);
appendLineStringBuf(sourceFiles, buf);
srcPtr = srcPtr->next;
}
pkg = spec->packages;
while (pkg) {
srcPtr = pkg->icon;
while (srcPtr) {
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
for (srcPtr = pkg->icon; srcPtr != NULL; srcPtr = srcPtr->next) {
sprintf(buf, "%s%s/%s",
srcPtr->flags & RPMBUILD_ISNO ? "!" : "",
rpmGetVar(RPMVAR_SOURCEDIR), srcPtr->source);
appendLineStringBuf(sourceFiles, buf);
srcPtr = srcPtr->next;
}
pkg = pkg->next;
}
spec->sourceCpioList = NULL;
@ -1632,11 +1631,9 @@ int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
int res, rc;
char *name;
pkg = spec->packages;
res = 0;
while (pkg) {
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
if (!pkg->fileList) {
pkg = pkg->next;
continue;
}
@ -1650,7 +1647,6 @@ int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
generateAutoReqProv(spec, pkg, pkg->cpioList, pkg->cpioCount);
printReqs(spec, pkg);
pkg = pkg->next;
}
return res;

2
build/spec.c
View File

@ -439,7 +439,9 @@ void freeSpec(Spec spec)
FREE(spec->passPhrase);
FREE(spec->cookie);
#ifdef DEAD
freeMacros(spec->macros);
#endif
freeSources(spec);
freePackages(spec);

2
lib/rpmrc.c
View File

@ -680,7 +680,6 @@ static int doReadRC(int fd, char * filename) {
}
if (option->macroize && strcmp(start, current[ARCH])) {
char *s = buf;
*s++ = '_';
if (option->localize)
*s++ = '_';
strcpy(s, option->name);
@ -691,7 +690,6 @@ static int doReadRC(int fd, char * filename) {
/* XXX for now only non-arch values can get macroized */
if (option->macroize) {
char *s = buf;
*s++ = '_';
if (option->localize)
*s++ = '_';
strcpy(s, option->name);