Force the CMake change regarding the in-source builds also to F31 and F32
    
    %%cmake macro covers the %%{set_build_flags}, so they are not needed
    That also means, the debug build changes to the build flags must be done AFTER the  %%cmake macro was used.
    
    %%cmake macro also covers several other options which redudndant specification I removed in this commit
    
    Default to %%cmake commands instead of %%make commands