[companion-integrate] RTI - Fix for SFWrpm

[Steve Christensen]

This is a RTI for a fix to the SFWrpm package files so
that they will build in NV72 or higher.  The webrev is at

http://companion.sunfreeware.com/downloads/rpmwebrev/

This has been reviewed by Paul Cunningham and approved.
His suggestions were implemented.  See companion-discuss.

Details:

In NV 72 or higher, there is now a file err.h in
/usr/include that conflicts with a err.h file in
the rpm source code.  When a build is attempted,
parts of the build find the /usr/include/err.h file and
the build fails.  The simplest thing to do was
rename the rpm err.h file to errx.h and patch a
few files to look for that instead of err.h.  The
code then builds with no problems in a nightly in
NV74.

Steve Christensen