Fixes: #2794 standardise on the macro %{name} %{version} for the rpm packages