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:   17-Aug-2008 18:04:59
  Branch: rpm-5_1                          Handle: 2008081716045801

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/python              rpmmodule.c

  Log:
    - WR: Use %{_host_vendor} and %{_host_os} for platform.

  Summary:
    Revision    Changes     Path
    1.2288.2.81 +1  -0      rpm/CHANGES
    1.168.2.1   +4  -0      rpm/python/rpmmodule.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.80 -r1.2288.2.81 CHANGES
  --- rpm/CHANGES	17 Aug 2008 15:51:23 -0000	1.2288.2.80
  +++ rpm/CHANGES	17 Aug 2008 16:04:58 -0000	1.2288.2.81
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - jbj: WR: Use %{_host_vendor} and %{_host_os} for platform.
       - jbj: WR: fakeroot maps devices to files. avoid /dev/* in checkfiles.
       - jbj: db_tool: remove gcc whinings.
       - jbj: QNX: use strtouq() instead of strtoul() in rpmmtree.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/rpmmodule.c
  ============================================================================
  $ cvs diff -u -r1.168 -r1.168.2.1 rpmmodule.c
  --- rpm/python/rpmmodule.c	12 Mar 2008 19:41:12 -0000	1.168
  +++ rpm/python/rpmmodule.c	17 Aug 2008 16:04:59 -0000	1.168.2.1
  @@ -64,7 +64,11 @@
       if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch))
   	return NULL;
   
  +#if defined(RPM_VENDOR_WINDRIVER)
  +    platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL);
  +#else
       platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL);
  +#endif
       score = rpmPlatformScore(platform, NULL, 0);
       platform = _free(platform);
   
  @@ .