Fix spec and merge changes from SUSE spec files

Fix package requirements to get sgdisk and merge some changes back from SUSE spec file.