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:00:16
Branch: HEAD Handle: 2008040221001600
Modified files:
rpm CHANGES VENDOR
rpm/build parsePrep.c
Log:
- jbj: merge "download-source-files-from-original-location" patch from OpenP
KG.
Summary:
Revision Changes Path
1.2280 +1 -0 rpm/CHANGES
2.44 +0 -10 rpm/VENDOR
2.116 +0 -2 rpm/build/parsePrep.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2279 -r1.2280 CHANGES
--- rpm/CHANGES 2 Apr 2008 20:57:21 -0000 1.2279
+++ rpm/CHANGES 2 Apr 2008 21:00:16 -0000 1.2280
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - 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.
- jbj: fix: RPMTAG_NVRA w .src/.pubkey in error msg is bogus.
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.43 -r2.44 VENDOR
--- rpm/VENDOR 2 Apr 2008 20:57:21 -0000 2.43
+++ rpm/VENDOR 2 Apr 2008 21:00:16 -0000 2.44
@@ -285,16 +285,6 @@
should be able to control verbosity manually.
________________________________________________________________________
- Change: download-source-files-from-original-location
- Purpose: Allow RPM to download missing source files also
- from the original location (in addition to the
- macro-controlled remote locations).
- Reason: In OpenPKG we always download URL-based source
- files directly from the upstream vendor. Hence we
- want that RPM is able to download from the original
- location, too.
- ________________________________________________________________________
-
Change: explicit-source-fetch-cli-option
Purpose: Provide build-time option "-bf" for just fetching
the missing source and patch files. Additionally,
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.115 -r2.116 parsePrep.c
--- rpm/build/parsePrep.c 15 Mar 2008 20:57:50 -0000 2.115
+++ rpm/build/parsePrep.c 2 Apr 2008 21:00:16 -0000 2.116
@@ -793,7 +793,6 @@
}
cp = _free(cp);
-#if defined(RPM_VENDOR_OPENPKG) /*
download-source-files-from-original-location */
/* try to fetch from original location */
rpmlog(RPMLOG_NOTICE, _("Fetching(%s%d): %s\n"),
(sp->flags & RPMFILE_SOURCE) ? "Source" : "Patch", sp->num,
sp->fullSource);
@@ -805,7 +804,6 @@
(sp->flags & RPMFILE_SOURCE) ? "Source" : "Patch",
sp->num, ftpStrerror(rc));
ec++;
}
-#endif
rpmlog(RPMLOG_ERR, _("Missing %s%d: %s: %s\n"),
((sp->flags & RPMFILE_SOURCE) ? "Source" : "Patch"),
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
