This occurred because I applied the patch as follows:

      cd rpm50_checkouut
      curl http://rpm5.org/cvs/chngview?cn=9423 | patch -p1

Is there a better way to move patches around?

73 de Jeff

On Feb 7, 2008, at 1:17 PM, Ralf S. Engelschall wrote:

>   RPM Package Manager, CVS Repository
>   http://rpm5.org/cvs/
>    
> ______________________________________________________________________ 
> ______
>
>   Server: rpm5.org                         Name:   Ralf S. Engelschall
>   Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
>   Module: rpm                              Date:   07-Feb-2008  
> 19:17:05
>   Branch: rpm-5_0                          Handle: 2008020718170500
>
>   Modified files:           (Branch: rpm-5_0)
>     rpm                     system.h
>
>   Log:
>     remove doubled entry and fix #include by replacing HTML escapes
>
>   Summary:
>     Revision    Changes     Path
>     2.104.2.3   +1  -13     rpm/system.h
>    
> ______________________________________________________________________ 
> ______
>
>   patch -p0 <<'@@ .'
>   Index: rpm/system.h
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r2.104.2.2 -r2.104.2.3 system.h
>   --- rpm/system.h	7 Feb 2008 18:09:54 -0000	2.104.2.2
>   +++ rpm/system.h	7 Feb 2008 18:17:05 -0000	2.104.2.3
>   @@ -735,19 +735,7 @@
>     * as this applic is not QNET aware, we can set it to 'local node'
>     */
>    #if defined(__QNXNTO__)
>   -#include &lt;sys/netmgr.h&gt;
>   -#define Makedev(x,y)   makedev(ND_LOCAL_NODE,(x),(y))
>   -#else
>   -#define Makedev(x,y)   makedev((x),(y))
>   -#endif
>   -
>   -/**
>   - * makedev() on QNX takes three parameters
>   - * the additional one (first place) specifies the node for QNET
>   - * as this applic is not QNET aware, we can set it to 'local node'
>   - */
>   -#if defined(__QNXNTO__)
>   -#include &lt;sys/netmgr.h&gt;
>   +#include <sys/netmgr.h>
>    #define Makedev(x,y)   makedev(ND_LOCAL_NODE,(x),(y))
>    #else
>    #define Makedev(x,y)   makedev((x),(y))
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org