resurrect toplevel tar target.

spec file removal separate from source removal (Shing-Gene Yung).

CVS patchset: 3042
CVS date: 1999/04/30 15:55:45

1 files changed, 7 insertions, 2 deletions

diff --git a/rpm.c b/rpm.c
index 035729037..4b719d5b6 100755
--- a/rpm.c
+++ b/rpm.c
@@ -898,6 +898,9 @@ int main(int argc, char ** argv) {
 
     if ((buildArgs.buildAmount & RPMBUILD_RMSOURCE) && bigMode == MODE_UNKNOWN)
 	bigMode = MODE_BUILD;
+
+    if ((buildArgs.buildAmount & RPMBUILD_RMSPEC) && bigMode == MODE_UNKNOWN)
+	bigMode = MODE_BUILD;
     
     if (initdb) {
 	if (bigMode != MODE_UNKNOWN) 
@@ -946,9 +949,10 @@ int main(int argc, char ** argv) {
 	argerror(_("unexpected query source"));
 
     if (!(bigMode == MODE_INSTALL ||
-         (bigMode == MODE_BUILD && (buildArgs.buildAmount & RPMBUILD_RMSOURCE)))
+	 (bigMode==MODE_BUILD && (buildArgs.buildAmount & RPMBUILD_RMSOURCE))||
+	 (bigMode==MODE_BUILD && (buildArgs.buildAmount & RPMBUILD_RMSPEC))) 
 	&& force)
-	argerror(_("only installation, upgrading and rmsource may be forced"));
+	argerror(_("only installation, upgrading, rmsource and rmspec may be forced"));
 
     if (bigMode != MODE_INSTALL && badReloc)
 	argerror(_("files may only be relocated during package installation"));
@@ -1237,6 +1241,7 @@ int main(int argc, char ** argv) {
 	if (bigMode == MODE_REBUILD) {
 	    buildArgs.buildAmount |= RPMBUILD_PACKAGEBINARY;
 	    buildArgs.buildAmount |= RPMBUILD_RMSOURCE;
+	    buildArgs.buildAmount |= RPMBUILD_RMSPEC;
 	    buildArgs.buildAmount |= RPMBUILD_CLEAN;
 	    buildArgs.buildAmount |= RPMBUILD_RMBUILD;
 	}