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: 05-Feb-2004 10:35:54
Branch: HEAD Handle: 2004020509355102
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:
- add --tack-dump and make sure --track/-bt do not require dependencies and sources
- make sure -bs no longer requires dependencies
Summary:
Revision Changes Path
1.120 +2 -0 openpkg-src/openpkg/HISTORY
1.278 +1 -1 openpkg-src/openpkg/openpkg.spec
1.42 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.43 +29 -22 openpkg-src/openpkg/rpm.patch.feature
1.51 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.41 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.14 +5 -0 openpkg-src/openpkg/rpmpopt
1.8431 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.119 -r1.120 HISTORY
--- openpkg-src/openpkg/HISTORY 4 Feb 2004 08:37:09 -0000 1.119
+++ openpkg-src/openpkg/HISTORY 5 Feb 2004 09:35:53 -0000 1.120
@@ -2,6 +2,8 @@
2004
====
+20040205 add --tack-dump and make sure --track/-bt do not require dependencies and
sources
+20040205 make sure -bs no longer requires dependencies
20040204 fix class checking macro l_check_class.
20040203 actually use new Class: header and %track section
20040130 add support to RPM for new "%track" section which will become the new
vcheck(1) source
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.277 -r1.278 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 4 Feb 2004 08:37:09 -0000 1.277
+++ openpkg-src/openpkg/openpkg.spec 5 Feb 2004 09:35:53 -0000 1.278
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040204
+%define V_openpkg 20040205
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.41 -r1.42 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 30 Jan 2004 16:59:33 -0000 1.41
+++ openpkg-src/openpkg/rpm.patch.bugfix 5 Feb 2004 09:35:53 -0000 1.42
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 30-Jan-2004
+## Created on: 05-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.42 -r1.43 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 30 Jan 2004 16:59:33 -0000 1.42
+++ openpkg-src/openpkg/rpm.patch.feature 5 Feb 2004 09:35:53 -0000 1.43
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 30-Jan-2004
+## Created on: 05-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 28 Jan 2004 14:36:38 -0000
++++ build/build.c 30 Jan 2004 17:06:28 -0000 1.3
@@ -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 28 Jan 2004 14:36:38 -0000
++++ build/build.c 30 Jan 2004 17:06:28 -0000 1.3
@@ -113,6 +129,14 @@
mTemplate = "%{__spec_clean_template}";
mPost = "%{__spec_clean_post}";
@@ -365,7 +365,7 @@
+---------------------------------------------------------------------------
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
-+++ build/build.c 28 Jan 2004 14:36:38 -0000
++++ build/build.c 30 Jan 2004 17:06:28 -0000 1.3
@@ -242,7 +270,9 @@
exit:
@@ -388,7 +388,7 @@
+---------------------------------------------------------------------------
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
-+++ build/build.c 28 Jan 2004 14:36:38 -0000
++++ build/build.c 30 Jan 2004 17:06:28 -0000 1.3
@@ -338,6 +374,21 @@
if (what & RPMBUILD_RMSPEC)
(void) Unlink(spec->specFile);
@@ -711,7 +711,7 @@
+---------------------------------------------------------------------------
Index: build/parseScript.c
--- build/parseScript.c 23 Jun 2002 19:47:12 -0000 1.1.1.12
-+++ build/parseScript.c 23 Jan 2004 10:28:41 -0000
++++ build/parseScript.c 30 Jan 2004 17:06:29 -0000 1.3
@@ -261,6 +269,7 @@
stripTrailingBlanksStringBuf(sb);
p = getStringBuf(sb);
@@ -728,7 +728,7 @@
+---------------------------------------------------------------------------
Index: build/spec.c
--- build/spec.c 4 Mar 2003 15:25:51 -0000 1.1.1.21
-+++ build/spec.c 23 Jan 2004 10:28:41 -0000
++++ build/spec.c 30 Jan 2004 17:06:31 -0000 1.3
@@ -334,7 +337,15 @@
if (tag != RPMTAG_ICON) {
@@ -1088,13 +1088,13 @@
+---------------------------------------------------------------------------
Index: macros.in
--- macros.in 2 Jul 2003 19:20:52 -0000 1.1.1.14
-+++ macros.in 28 Jan 2004 20:34:45 -0000
++++ macros.in 30 Jan 2004 17:06:27 -0000 1.3
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
# \verbatim
#
--# $Id: rpm.patch.feature,v 1.42 2004/01/30 16:59:33 rse Exp $
-+# $Id: rpm.patch.feature,v 1.42 2004/01/30 16:59:33 rse Exp $
+-# $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 $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -1502,7 +1502,7 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 23 Jan 2004 10:28:42 -0000
++++ rpmqv.c 5 Feb 2004 08:53:36 -0000
@@ -682,6 +682,10 @@
case 'b':
ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
@@ -1637,7 +1637,7 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 23 Jan 2004 10:28:42 -0000
++++ rpmqv.c 5 Feb 2004 08:53:36 -0000
@@ -126,7 +126,7 @@
/[EMAIL PROTECTED] rpmEVR, fileSystem @*/
/[EMAIL PROTECTED] *fp, fileSystem @*/
@@ -1656,14 +1656,21 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 23 Jan 2004 10:28:42 -0000
-@@ -704,6 +708,11 @@
++++ rpmqv.c 5 Feb 2004 08:53:36 -0000
+@@ -703,7 +707,18 @@
+ /[EMAIL PROTECTED]@*/ break;
case 's':
ba->buildAmount |= RPMBUILD_PACKAGESOURCE;
++ /* enforce no dependency checking */
++ ba->noDeps = 1;
/[EMAIL PROTECTED]@*/ break;
+#ifdef OPENPKG
+ case 't':
+ ba->buildAmount |= RPMBUILD_TRACK;
++ /* enforce no dependency checking and expansion of %setup and %patch
macros */
++ ba->noDeps = 1;
++ rpmDefineMacro(NULL, "setup #", RMIL_CMDLINE);
++ rpmDefineMacro(NULL, "patch #", RMIL_CMDLINE);
+ /[EMAIL PROTECTED]@*/ break;
+#endif
}
@@ -1678,7 +1685,7 @@
+---------------------------------------------------------------------------
Index: build/pack.c
--- build/pack.c 4 Mar 2003 17:03:17 -0000 1.1.1.20
-+++ build/pack.c 23 Jan 2004 10:28:41 -0000
++++ build/pack.c 30 Jan 2004 17:06:29 -0000 1.2
@@ -252,6 +252,15 @@
return RPMERR_BADFILENAME;
}
@@ -1704,7 +1711,7 @@
+---------------------------------------------------------------------------
Index: build/parseBuildInstallClean.c
--- build/parseBuildInstallClean.c 3 Mar 2003 20:43:30 -0000 1.1.1.9
-+++ build/parseBuildInstallClean.c 23 Jan 2004 10:28:41 -0000
++++ build/parseBuildInstallClean.c 30 Jan 2004 17:06:29 -0000 1.2
@@ -29,6 +29,11 @@
} else if (parsePart == PART_CLEAN) {
sbp = &(spec->clean);
@@ -1726,7 +1733,7 @@
+---------------------------------------------------------------------------
Index: build/parseScript.c
--- build/parseScript.c 23 Jun 2002 19:47:12 -0000 1.1.1.12
-+++ build/parseScript.c 23 Jan 2004 10:28:41 -0000
++++ build/parseScript.c 30 Jan 2004 17:06:29 -0000 1.3
@@ -156,6 +156,14 @@
progtag = RPMTAG_TRIGGERSCRIPTPROG;
partname = "%triggerpostun";
@@ -1763,7 +1770,7 @@
+---------------------------------------------------------------------------
Index: build/parseSpec.c
--- build/parseSpec.c 15 May 2003 13:38:57 -0000 1.1.1.15
-+++ build/parseSpec.c 23 Jan 2004 10:28:41 -0000
++++ build/parseSpec.c 30 Jan 2004 17:06:30 -0000 1.2
@@ -43,6 +43,10 @@
{ PART_TRIGGERIN, 0, "%triggerin"},
{ PART_TRIGGERIN, 0, "%trigger"},
@@ -1800,7 +1807,7 @@
+---------------------------------------------------------------------------
Index: build/poptBT.c
--- build/poptBT.c 3 Mar 2003 20:04:12 -0000 1.1.1.3
-+++ build/poptBT.c 23 Jan 2004 10:28:42 -0000
++++ build/poptBT.c 30 Jan 2004 17:06:30 -0000 1.2
@@ -35,6 +35,9 @@
#define POPT_BL 0x626c
#define POPT_BP 0x6270
@@ -1842,7 +1849,7 @@
+---------------------------------------------------------------------------
Index: build/rpmbuild.h
--- build/rpmbuild.h 4 Mar 2003 17:03:07 -0000 1.1.1.13
-+++ build/rpmbuild.h 23 Jan 2004 10:28:41 -0000
++++ build/rpmbuild.h 30 Jan 2004 17:06:30 -0000 1.2
@@ -34,6 +34,9 @@
RPMBUILD_RMSOURCE = (1 << 8), /*!< Remove source(s) and patch(s). */
RPMBUILD_RMBUILD = (1 << 9), /*!< Remove build sub-tree. */
@@ -1876,7 +1883,7 @@
+---------------------------------------------------------------------------
Index: build/rpmspec.h
--- build/rpmspec.h 4 Mar 2003 15:30:23 -0000 1.1.1.11
-+++ build/rpmspec.h 23 Jan 2004 10:28:41 -0000
++++ build/rpmspec.h 30 Jan 2004 17:06:30 -0000 1.2
@@ -164,6 +164,10 @@
StringBuf check; /*!< %check scriptlet. */
/[EMAIL PROTECTED]@*/
@@ -1908,7 +1915,7 @@
+---------------------------------------------------------------------------
Index: build/spec.c
--- build/spec.c 4 Mar 2003 15:25:51 -0000 1.1.1.21
-+++ build/spec.c 23 Jan 2004 10:28:41 -0000
++++ build/spec.c 30 Jan 2004 17:06:31 -0000 1.3
@@ -138,6 +138,9 @@
p->preUnFile = NULL;
p->postUnFile = NULL;
@@ -1948,7 +1955,7 @@
+---------------------------------------------------------------------------
Index: lib/rpmlib.h
--- lib/rpmlib.h 19 Jun 2003 17:39:35 -0000 1.1.1.26
-+++ lib/rpmlib.h 29 Jan 2004 19:50:37 -0000
++++ lib/rpmlib.h 30 Jan 2004 17:06:31 -0000 1.2
@@ -414,6 +414,12 @@
RPMTAG_FILEDEPENDSN = 1144,
RPMTAG_DEPENDSDICT = 1145,
@@ -1982,7 +1989,7 @@
+---------------------------------------------------------------------------
Index: rpmdb/tagtbl.c
--- rpmdb/tagtbl.c 2 Jul 2003 20:20:27 -0000 1.1.1.4
-+++ rpmdb/tagtbl.c 29 Jan 2004 19:36:03 -0000
++++ rpmdb/tagtbl.c 30 Jan 2004 17:06:32 -0000 1.2
@@ -135,6 +135,12 @@
{ "RPMTAG_FILEDEPENDSN", 1144, },
{ "RPMTAG_DEPENDSDICT", 1145, },
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.50 -r1.51 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 30 Jan 2004 16:59:34 -0000 1.50
+++ openpkg-src/openpkg/rpm.patch.porting 5 Feb 2004 09:35:53 -0000 1.51
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 30-Jan-2004
+## Created on: 05-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.40 -r1.41 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 30 Jan 2004 16:59:34 -0000 1.40
+++ openpkg-src/openpkg/rpm.patch.regen 5 Feb 2004 09:35:53 -0000 1.41
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 30-Jan-2004
+## Created on: 05-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.13 -r1.14 rpmpopt
--- openpkg-src/openpkg/rpmpopt 30 Jan 2004 16:59:34 -0000 1.13
+++ openpkg-src/openpkg/rpmpopt 5 Feb 2004 09:35:53 -0000 1.14
@@ -80,6 +80,11 @@
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'" \
+ --POPTdesc=$"dump the vendor source tracking script (%track)"
+
# RPM extension: "rpm --test"
rpm alias --test -q --qf '%{TEST}\n' \
--pipe "grep -v \(none\) | /openpkg-dev/lib/openpkg/bash" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8430 -r1.8431 news.txt
--- openpkg-web/news.txt 5 Feb 2004 08:46:44 -0000 1.8430
+++ openpkg-web/news.txt 5 Feb 2004 09:35:51 -0000 1.8431
@@ -1,3 +1,4 @@
+05-Feb-2004: Upgraded package: P<openpkg-20040205-20040205>
05-Feb-2004: Upgraded package: P<monit-4.1.1-20040205>
05-Feb-2004: Upgraded package: P<netcat-1.10-20040205>
04-Feb-2004: Upgraded package: P<mutt15-1.5.6i-20040204>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
