disable %prep checks under --track-dump and cleanup its output

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20040206 disable %prep checks under --track-dump and cleanup its output
 20040205 activate only the %env of "openpkg" in the "musr" run-time environment
 20040205 add --tack-dump and make sure --track/-bt do not require dependencies and sources
 20040205 make sure -bs no longer requires dependencies

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040205
+%define       V_openpkg  20040206
 
 #   the used software versions
 %define       V_rpm      4.2.1

openpkg/rpm.patch.bugfix

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 05-Feb-2004
+##  Created on: 06-Feb-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.

openpkg/rpm.patch.feature

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 05-Feb-2004
+##  Created on: 06-Feb-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -272,7 +272,7 @@ Index: Makefile.in
 +---------------------------------------------------------------------------
 Index: build/build.c
 --- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
-+++ build/build.c	30 Jan 2004 17:06:28 -0000	1.3
++++ build/build.c	6 Feb 2004 08:04:09 -0000
 @@ -33,7 +33,15 @@
  
      for (p = spec->sources; p != NULL; p = p->next) {
@@ -314,7 +314,7 @@ Index: build/build.c
 +---------------------------------------------------------------------------
 Index: build/build.c
 --- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
-+++ build/build.c	30 Jan 2004 17:06:28 -0000	1.3
++++ build/build.c	6 Feb 2004 08:04:09 -0000
 @@ -113,6 +129,14 @@
  	mTemplate = "%{__spec_clean_template}";
  	mPost = "%{__spec_clean_post}";
@@ -342,7 +342,17 @@ Index: build/build.c
  	fprintf(fp, "cd %s\n", spec->buildSubdir);
  
      if (what == RPMBUILD_RMBUILD) {
-@@ -290,6 +320,12 @@
+@@ -215,6 +243,9 @@
+     buildCmd = rpmExpand("%{___build_cmd}", " ", buildScript, NULL);
+     (void) poptParseArgvString(buildCmd, &argc, &argv);
+ 
++#ifdef OPENPKG
++    if (what != RPMBUILD_TRACK)
++#endif
+     rpmMessage(RPMMESS_NORMAL, _("Executing(%s): %s\n"), name, buildCmd);
+     if (!(child = fork())) {
+ 
+@@ -290,6 +323,12 @@
  /*@=boundsread@*/
  	}
      } else {
@@ -365,8 +375,8 @@ Index: build/build.c
 +---------------------------------------------------------------------------
 Index: build/build.c
 --- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
-+++ build/build.c	30 Jan 2004 17:06:28 -0000	1.3
-@@ -242,7 +270,9 @@
++++ build/build.c	6 Feb 2004 08:04:09 -0000
+@@ -242,7 +273,9 @@
      
  exit:
      if (scriptName) {
@@ -388,8 +398,8 @@ Index: build/build.c
 +---------------------------------------------------------------------------
 Index: build/build.c
 --- build/build.c	4 Mar 2003 15:27:33 -0000	1.1.1.20
-+++ build/build.c	30 Jan 2004 17:06:28 -0000	1.3
-@@ -338,6 +374,21 @@
++++ build/build.c	6 Feb 2004 08:04:09 -0000
+@@ -338,6 +377,21 @@
      if (what & RPMBUILD_RMSPEC)
  	(void) Unlink(spec->specFile);
  

openpkg/rpm.patch.porting

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 05-Feb-2004
+##  Created on: 06-Feb-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.

openpkg/rpm.patch.regen

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 05-Feb-2004
+##  Created on: 06-Feb-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.

openpkg/rpmpopt

@@ -81,8 +81,7 @@ rpm alias --track -bt \
     --POPTdesc=$"run package vendor source tracking script (%track)"
 
 #   RPM extension: "rpm --track-dump"
-rpm alias --track-dump -bt --define '___track_dump yes' \
-    --pipe="sed -e '/^Executing(%track)/d'" \
+rpm alias --track-dump -bt --define '___track_dump yes' --define 'prep %%prep' \
     --POPTdesc=$"dump the vendor source tracking script (%track)"
 
 #   RPM extension: "rpm --test"