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: 19-Dec-2007 04:50:40
Branch: HEAD Handle: 2007121903504000
Modified files:
rpm CHANGES
rpm/lib rpmfi.c
Log:
- fix: insure that %{name} is expanded correctly in srpm paths.
Summary:
Revision Changes Path
1.1999 +1 -0 rpm/CHANGES
2.109 +2 -2 rpm/lib/rpmfi.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1998 -r1.1999 CHANGES
--- rpm/CHANGES 19 Dec 2007 03:00:22 -0000 1.1998
+++ rpm/CHANGES 19 Dec 2007 03:50:40 -0000 1.1999
@@ -1,4 +1,5 @@
5.0b2 -> 5.0b3:
+ - jbj: fix: insure that %{name} is expanded correctly in srpm paths.
- jbj: using tagValue() rather than tagGenerate() permits changing the
tagno
to & from arbitrary transparent. likely more needs doing.
- jbj: reimplement %track as an arbitrary section.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.108 -r2.109 rpmfi.c
--- rpm/lib/rpmfi.c 3 Dec 2007 18:11:09 -0000 2.108
+++ rpm/lib/rpmfi.c 19 Dec 2007 03:50:40 -0000 2.109
@@ -1485,13 +1485,13 @@
char * te;
size_t nb;
- xx = headerMacrosLoad(fi->h);
+ xx = headerMacrosLoad(h);
av[0] = rpmGenPath(rpmtsRootDir(ts), "%{_sourcedir}", "");
av[1] = rpmGenPath(rpmtsRootDir(ts), "%{_specdir}", "");
av[2] = rpmGenPath(rpmtsRootDir(ts), "%{_patchdir}", "");
av[3] = rpmGenPath(rpmtsRootDir(ts), "%{_icondir}", "");
av[4] = NULL;
- xx = headerMacrosUnload(fi->h);
+ xx = headerMacrosUnload(h);
/* Hack up a header RPM_STRING_ARRAY_TYPE array. */
fi->dnl = _free(fi->dnl);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
