RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   06-Sep-2008 21:00:38
  Branch: rpm-5_1                          Handle: 2008090619003701

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/lib                 poptALL.c

  Log:
    - jbj: WR: remove version from config paths.

  Summary:
    Revision    Changes     Path
    1.2288.2.106+1  -0      rpm/CHANGES
    2.90.2.4    +2  -2      rpm/lib/poptALL.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.105 -r1.2288.2.106 CHANGES
  --- rpm/CHANGES	6 Sep 2008 18:58:44 -0000	1.2288.2.105
  +++ rpm/CHANGES	6 Sep 2008 19:00:37 -0000	1.2288.2.106
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - 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.
       - jbj: merge po files.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.90.2.3 -r2.90.2.4 poptALL.c
  --- rpm/lib/poptALL.c	1 Sep 2008 22:35:11 -0000	2.90.2.3
  +++ rpm/lib/poptALL.c	6 Sep 2008 19:00:38 -0000	2.90.2.4
  @@ -615,7 +615,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);
       }
  @@ -625,7 +625,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);
       }
  @@ .