[Cooker] file conflict --> diffutils and man-pages package

[Stefan van der Eijk]

rpm -Uvh diffutils-2.7-24mdk.alpha.rpm
file /usr/share/man/man1/diff.1.bz2 from install of diffutils-2.7-24mdk
conflicts with file from package man-pages-1.31-1mdk