RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Apr-2008 23:03:27
Branch: HEAD Handle: 2008040221032601
Modified files:
rpm CHANGES
rpm/build parsePrep.c poptBT.c
Log:
- jbj: merge "explicit-source-fetch-cli-option" patch from OpenPKG.
Summary:
Revision Changes Path
1.2281 +1 -0 rpm/CHANGES
2.117 +0 -4 rpm/build/parsePrep.c
2.26 +0 -6 rpm/build/poptBT.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2280 -r1.2281 CHANGES
--- rpm/CHANGES 2 Apr 2008 21:00:16 -0000 1.2280
+++ rpm/CHANGES 2 Apr 2008 21:03:26 -0000 1.2281
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - jbj: merge "explicit-source-fetch-cli-option" patch from OpenPKG.
- jbj: merge "download-source-files-from-original-location" patch from
OpenPKG.
- jbj: merge "support-external-download-command" patch from OpenPKG.
- jbj: merge "support-srcdefattr" patch from OpenPKG.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.116 -r2.117 parsePrep.c
--- rpm/build/parsePrep.c 2 Apr 2008 21:00:16 -0000 2.116
+++ rpm/build/parsePrep.c 2 Apr 2008 21:03:27 -0000 2.117
@@ -645,7 +645,6 @@
/[EMAIL PROTECTED]@*/ struct stat *st)
/[EMAIL PROTECTED]/
{
-#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
char *buf;
size_t buf_len;
int i;
@@ -666,7 +665,6 @@
snprintf(buf+i, buf_len-i, " ...MISSING\n");
rpmlog(RPMLOG_NOTICE, "%s", buf);
buf = _free(buf);
-#endif
return;
}
@@ -715,10 +713,8 @@
if (rpmrc != RPMRC_OK)
return -1;
-#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
if (rpmIsVerbose() && !quietly && (rpmBTArgs.buildAmount &
RPMBUILD_FETCHSOURCE))
rpmlog(RPMLOG_NOTICE, "Checking source and patch file(s):\n");
-#endif
ec = 0;
for (sp = spec->sources; sp != NULL; sp = sp->next) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/poptBT.c
============================================================================
$ cvs diff -u -r2.25 -r2.26 poptBT.c
--- rpm/build/poptBT.c 2 Apr 2008 18:35:26 -0000 2.25
+++ rpm/build/poptBT.c 2 Apr 2008 21:03:27 -0000 2.26
@@ -36,9 +36,7 @@
#define POPT_BP 0x6270
#define POPT_BS 0x6273
#define POPT_BT 0x6274 /* support "%track"
script/section */
-#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
#define POPT_BF 0x6266
-#endif
#define POPT_TA 0x7461
#define POPT_TB 0x7462
#define POPT_TC 0x7463
@@ -82,9 +80,7 @@
case POPT_BP:
case POPT_BS:
case POPT_BT: /* support "%track" script/section */
-#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
case POPT_BF:
-#endif
case POPT_TA:
case POPT_TB:
case POPT_TC:
@@ -161,11 +157,9 @@
{ "bt", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BT,
N_("track versions of sources from <specfile>"),
N_("<specfile>") },
-#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
{ "bf", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BF,
N_("fetch missing source and patch files"),
N_("<specfile>") },
-#endif
{ "tp", 0, POPT_ARGFLAG_ONEDASH, NULL, POPT_TP,
N_("build through %prep (unpack sources and apply patches) from
<tarball>"),
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
