filesystem-2015.02 package errors from symlinks

[Genes Lists <lists@xxxxxxxxxxxx>]

   I use symlinks for some directories (e.g. /srv/http and 
/var/spool/mail are sym links to dedicated disks)

When i update the filesystem package I get this error:

error: failed to commit transaction (conflicting files)
filesystem: /srv/http exists in filesystem
filesystem: /var/spool/mail exists in filesystem
Errors occurred, no packages were upgraded.

What is the recommended way to deal with this?

My version is: filesystem 2014.10-3

Trying to update to : filesystem-2015.02-1
in testing repo.

Thanks.

Gene