Synchronize upstream spec file modifications (cherry picked from commit 155f7510be504a5cbeb91215955cb25049dfb8c7)