Summary of changes: 620f235... Rework of the %prep phase to be able to patch both EmptyEps (*) e1be275... Cherry-pick more upstream commits to fix the CMake build - (*) b4a5bd1... Remove the CMake out-of-source build process related macro (*) 92a0149... Fix the Findjson11.cmake to avoid the CMake warning about c (*) (*) This commit already existed in another branch; no separate mail sent