[OS-BUILD PATCH] genspec.sh: rebase the broken-out patches