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:   22-Aug-2008 06:58:59
  Branch: rpm-5_1                          Handle: 2008082204585900

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES devtool.conf

  Log:
    - WR: remove --with-path-versioned in devtool targets.
    - WR: remove $(VERION) from macros paths in devtool targets.

  Summary:
    Revision    Changes     Path
    1.2288.2.101+2  -0      rpm/CHANGES
    2.205.2.15  +6  -2      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.100 -r1.2288.2.101 CHANGES
  --- rpm/CHANGES	22 Aug 2008 04:46:47 -0000	1.2288.2.100
  +++ rpm/CHANGES	22 Aug 2008 04:58:59 -0000	1.2288.2.101
  @@ -1,4 +1,6 @@
   5.1.4 -> 5.1.5:
  +    - jbj: WR: remove --with-path-versioned in devtool targets.
  +    - jbj: WR: remove $(VERION) from macros paths in devtool targets.
       - jbj: WR: fix: cleanup patch integration thinkos.
       - jbj: WR: mark wrs-rpm-enable-macro-validation.patch (but leave disabled).
       - jbj: WR: fix: add rt-reloc-wrapper.sh to EXTRAS_DIST.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.205.2.14 -r2.205.2.15 devtool.conf
  --- rpm/devtool.conf	21 Aug 2008 03:39:24 -0000	2.205.2.14
  +++ rpm/devtool.conf	22 Aug 2008 04:58:59 -0000	2.205.2.15
  @@ -140,9 +140,11 @@
       %autogen
       %configure \
           --prefix=/usr \
  +        --with-path-versioned=yes \
           --with-path-lib=/usr/lib/rpm \
           --with-python-lib-dir=/usr/lib/python2.5 \
           --disable-nls \
  +        --disable-rpath \
           --with-libelf \
           --without-selinux \
           --without-perl \
  @@ -158,7 +160,7 @@
           --with-db=internal \
           --with-lua=internal \
           --without-apidocs \
  -        --with-path-macros='%{_usrlibrpm}/5.0/macros:%{_usrlibrpm}/5.0/wrs/macros:%{_usrlibrpm}/5.0/wrs/%{_target}/macros:~/.wrsrpmmacros' \
  +        --with-path-macros='%{_usrlibrpm}/macros:%{_usrlibrpm}/wrs/macros:%{_usrlibrpm}/wrs/%{_target}/macros:~/.wrsrpmmacros' \
           --with-bugreport=support@windriver.com \
           --verbose \
           --with-db-tools-integrated \
  @@ -178,7 +180,9 @@
       %autogen
       %configure \
           --prefix=/usr \
  +        --with-path-versioned=yes \
           --disable-nls \
  +        --disable-rpath \
           --with-libelf \
           --with-selinux \
           --with-perl \
  @@ -193,7 +197,7 @@
           --with-db=internal \
           --with-lua=internal \
           --without-apidocs \
  -        --with-path-macros='%{_usrlibrpm}/5.0/macros:%{_usrlibrpm}/5.0/wrs/macros:%{_usrlibrpm}/5.0/wrs/default-linux/macros:%{_usrlibrpm}/5.0/wrs/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.wrsrpmmacros' \
  +        --with-path-macros='%{_usrlibrpm}/macros:%{_usrlibrpm}/wrs/macros:%{_usrlibrpm}/wrs/default-linux/macros:%{_usrlibrpm}/wrs/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.wrsrpmmacros' \
           --with-bugreport=support@windriver.com \
           --verbose \
           --with-db-tools-integrated \
  @@ .