Spain to allow bullfighting, clubs without dance floors