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: 06-Sep-2008 21:00:16
Branch: HEAD Handle: 2008090619001600
Modified files:
rpm CHANGES
rpm/lib poptALL.c
Log:
- jbj: WR: remove version from config paths.
Summary:
Revision Changes Path
1.2542 +1 -0 rpm/CHANGES
2.100 +2 -2 rpm/lib/poptALL.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2541 -r1.2542 CHANGES
--- rpm/CHANGES 6 Sep 2008 18:58:09 -0000 1.2541
+++ rpm/CHANGES 6 Sep 2008 19:00:16 -0000 1.2542
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - jbj: WR: remove version from config paths.
- jbj: lua: fix: don't close dup'd stdout running lua scripts.
- jbj: macosx: avoid multiple definitions of _program_name.
- rse: upgrade embedded Lua from version 5.1.3 to 5.1.4
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.99 -r2.100 poptALL.c
--- rpm/lib/poptALL.c 1 Sep 2008 22:33:21 -0000 2.99
+++ rpm/lib/poptALL.c 6 Sep 2008 19:00:16 -0000 2.100
@@ -628,7 +628,7 @@
path_buf = _free(path_buf);
#if defined(RPM_VENDOR_WINDRIVER)
- { const char * poptAliasFn = rpmGetPath(__usrlibrpm, "/",
VERSION, "/rpmpopt", NULL);
+ { const char * poptAliasFn = rpmGetPath(__usrlibrpm, "/rpmpopt",
NULL);
(void) poptReadConfigFile(optCon, poptAliasFn);
poptAliasFn = _free(poptAliasFn);
}
@@ -638,7 +638,7 @@
(void) poptReadDefaultConfig(optCon, 1);
#if defined(RPM_VENDOR_WINDRIVER)
- { const char * poptExecPath = rpmGetPath(__usrlibrpm, "/",
VERSION, NULL);
+ { const char * poptExecPath = rpmGetPath(__usrlibrpm, NULL);
poptSetExecPath(optCon, poptExecPath, 1);
poptExecPath = _free(poptExecPath);
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
