OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Feb-2004 09:22:41
Branch: HEAD Handle: 2004020608223802
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen rpmpopt
openpkg-web news.txt
Log:
disable %prep checks under --track-dump and cleanup its output
Summary:
Revision Changes Path
1.123 +1 -0 openpkg-src/openpkg/HISTORY
1.279 +1 -1 openpkg-src/openpkg/openpkg.spec
1.43 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.44 +18 -8 openpkg-src/openpkg/rpm.patch.feature
1.52 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.42 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.15 +1 -2 openpkg-src/openpkg/rpmpopt
1.8443 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.122 -r1.123 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Feb 2004 16:36:05 -0000 1.122
+++ openpkg-src/openpkg/HISTORY 6 Feb 2004 08:22:40 -0000 1.123
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.278 -r1.279 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Feb 2004 09:35:53 -0000 1.278
+++ openpkg-src/openpkg/openpkg.spec 6 Feb 2004 08:22:40 -0000 1.279
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.42 -r1.43 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 5 Feb 2004 09:35:53 -0000 1.42
+++ openpkg-src/openpkg/rpm.patch.bugfix 6 Feb 2004 08:22:40 -0000 1.43
@@ -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.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.43 -r1.44 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 5 Feb 2004 09:35:53 -0000 1.43
+++ openpkg-src/openpkg/rpm.patch.feature 6 Feb 2004 08:22:40 -0000 1.44
@@ -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: 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
--- 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 @@
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 @@
/[EMAIL PROTECTED]@*/
}
} else {
@@ -365,8 +375,8 @@
+---------------------------------------------------------------------------
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
--- 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);
@@ -1093,8 +1103,8 @@
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
# \verbatim
#
--# $Id: rpm.patch.feature,v 1.43 2004/02/05 09:35:53 rse Exp $
-+# $Id: rpm.patch.feature,v 1.43 2004/02/05 09:35:53 rse Exp $
+-# $Id: rpm.patch.feature,v 1.44 2004/02/06 08:22:40 rse Exp $
++# $Id: rpm.patch.feature,v 1.44 2004/02/06 08:22:40 rse Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.51 -r1.52 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 5 Feb 2004 09:35:53 -0000 1.51
+++ openpkg-src/openpkg/rpm.patch.porting 6 Feb 2004 08:22:40 -0000 1.52
@@ -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.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.41 -r1.42 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 5 Feb 2004 09:35:53 -0000 1.41
+++ openpkg-src/openpkg/rpm.patch.regen 6 Feb 2004 08:22:40 -0000 1.42
@@ -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.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.14 -r1.15 rpmpopt
--- openpkg-src/openpkg/rpmpopt 5 Feb 2004 09:35:53 -0000 1.14
+++ openpkg-src/openpkg/rpmpopt 6 Feb 2004 08:22:40 -0000 1.15
@@ -81,8 +81,7 @@
--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"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8442 -r1.8443 news.txt
--- openpkg-web/news.txt 6 Feb 2004 08:20:30 -0000 1.8442
+++ openpkg-web/news.txt 6 Feb 2004 08:22:38 -0000 1.8443
@@ -1,3 +1,4 @@
+06-Feb-2004: Upgraded package: P<openpkg-20040206-20040206>
06-Feb-2004: Upgraded package: P<mplayer-1.0pre3-20040206>
06-Feb-2004: Upgraded package: P<vim-6.2.238-20040206>
06-Feb-2004: Upgraded package: P<xmlstarlet-0.8.1-20040206>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
