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 Date: 06-Feb-2004 09:43:28
Branch: HEAD Handle: 2004020608432701
Modified files:
openpkg-src/openpkg rpm.patch.feature rpmpopt
Log:
disable %prep already for regular --track/-bt and do it internally
Summary:
Revision Changes Path
1.45 +6 -5 openpkg-src/openpkg/rpm.patch.feature
1.16 +1 -1 openpkg-src/openpkg/rpmpopt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.44 -r1.45 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 6 Feb 2004 08:22:40 -0000 1.44
+++ openpkg-src/openpkg/rpm.patch.feature 6 Feb 2004 08:43:27 -0000 1.45
@@ -1103,8 +1103,8 @@
#/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
# \verbatim
#
--# $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 $
+-# $Id: rpm.patch.feature,v 1.45 2004/02/06 08:43:27 rse Exp $
++# $Id: rpm.patch.feature,v 1.45 2004/02/06 08:43:27 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
@@ -1512,7 +1512,7 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 5 Feb 2004 08:53:36 -0000
++++ rpmqv.c 6 Feb 2004 08:32:07 -0000
@@ -682,6 +682,10 @@
case 'b':
ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
@@ -1647,7 +1647,7 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 5 Feb 2004 08:53:36 -0000
++++ rpmqv.c 6 Feb 2004 08:32:07 -0000
@@ -126,7 +126,7 @@
/[EMAIL PROTECTED] rpmEVR, fileSystem @*/
/[EMAIL PROTECTED] *fp, fileSystem @*/
@@ -1666,8 +1666,8 @@
+---------------------------------------------------------------------------
Index: rpmqv.c
--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
-+++ rpmqv.c 5 Feb 2004 08:53:36 -0000
-@@ -703,7 +707,18 @@
++++ rpmqv.c 6 Feb 2004 08:32:07 -0000
+@@ -703,7 +707,19 @@
/[EMAIL PROTECTED]@*/ break;
case 's':
ba->buildAmount |= RPMBUILD_PACKAGESOURCE;
@@ -1677,10 +1677,11 @@
+#ifdef OPENPKG
+ case 't':
+ ba->buildAmount |= RPMBUILD_TRACK;
-+ /* enforce no dependency checking and expansion of %setup and %patch
macros */
++ /* enforce no dependency checking and expansion of %setup, %patch and
%prep macros */
+ ba->noDeps = 1;
+ rpmDefineMacro(NULL, "setup #", RMIL_CMDLINE);
+ rpmDefineMacro(NULL, "patch #", RMIL_CMDLINE);
++ rpmDefineMacro(NULL, "prep %%prep", RMIL_CMDLINE);
+ /[EMAIL PROTECTED]@*/ break;
+#endif
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.15 -r1.16 rpmpopt
--- openpkg-src/openpkg/rpmpopt 6 Feb 2004 08:22:40 -0000 1.15
+++ openpkg-src/openpkg/rpmpopt 6 Feb 2004 08:43:28 -0000 1.16
@@ -81,7 +81,7 @@
--POPTdesc=$"run package vendor source tracking script (%track)"
# RPM extension: "rpm --track-dump"
-rpm alias --track-dump -bt --define '___track_dump yes' --define 'prep %%prep' \
+rpm alias --track-dump -bt --define '___track_dump yes' \
--POPTdesc=$"dump the vendor source tracking script (%track)"
# RPM extension: "rpm --test"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
