- remove icons with --rmsource

- do dependecy generation on -bl
        - check files on all packages on -bl

CVS patchset: 2084
CVS date: 1998/04/09 16:46:30

CHANGES

@@ -1,3 +1,8 @@
+2.4.108 -> 2.4.109:
+        - remove icons with --rmsource
+        - do dependecy generation on -bl
+        - check files on all packages on -bl
+
 2.4.107 -> 2.4.108:
         - make --clean work with no %setup
 	- fixed FSSIZES problem introduced in 2.4.107

build/build.c

@@ -238,6 +238,7 @@ static int writeVars(Spec spec, FILE *f)
 static void doRmSource(Spec spec)
 {
     struct Source *p;
+    Package pkg;
     char buf[BUFSIZ];
     
     unlink(spec->specFile);
@@ -250,4 +251,17 @@ static void doRmSource(Spec spec)
 	}
 	p = p->next;
     }
+
+    pkg = spec->packages;
+    while (pkg) {
+	p = pkg->icon;
+	while (p) {
+	    if (! (p->flags & RPMBUILD_ISNO)) {
+		sprintf(buf, "%s/%s", rpmGetVar(RPMVAR_SOURCEDIR), p->source);
+		unlink(buf);
+	    }
+	    p = p->next;
+	}
+	pkg = pkg->next;
+    }
 }

build/files.c

@@ -258,23 +258,31 @@ int processSourceFiles(Spec spec)
 int processBinaryFiles(Spec spec, int installSpecialDoc)
 {
     Package pkg;
-    int rc;
+    int res, rc;
+    char *name;
     
     pkg = spec->packages;
+    res = 0;
     while (pkg) {
 	if (!pkg->fileList) {
 	    pkg = pkg->next;
 	    continue;
 	}
 
+	headerGetEntry(pkg->header, RPMTAG_NAME, NULL, (void **)&name, NULL);
+	rpmMessage(RPMMESS_NORMAL, "Processing files: %s\n", name);
+		   
 	if ((rc = processPackageFiles(spec, pkg, installSpecialDoc))) {
-	    return rc;
+	    res = rc;
 	}
 
+	generateAutoReqProv(spec, pkg, pkg->cpioList, pkg->cpioCount);
+	printReqs(spec, pkg);
+	
 	pkg = pkg->next;
     }
 
-    return 0;
+    return rc;
 }
 
 static int processPackageFiles(Spec spec, Package pkg, int installSpecialDoc)

build/pack.c

@@ -115,9 +115,6 @@ int packageBinaries(Spec spec)
 	    return rc;
 	}
 	
-	generateAutoReqProv(spec, pkg, pkg->cpioList, pkg->cpioCount);
-	printReqs(spec, pkg);
-	
 	if (spec->cookie) {
 	    headerAddEntry(pkg->header, RPMTAG_COOKIE,
 			   RPM_STRING_TYPE, spec->cookie, 1);

build/reqprov.c

@@ -212,7 +212,9 @@ void printReqs(Spec spec, Package pkg)
 	    }
 	    x++;
 	}
+	if (startedPreReq) {
 	    rpmMessage(RPMMESS_NORMAL, "\n");
+	}
 	x = 0;
 	while (x < count) {
 	    if (! (flags[x] & RPMSENSE_PREREQ)) {