'git am'able fix attached, let me know if you'd like me to push and build this for devel.
Created attachment 935200 [details] Build with $RPM_OPT_FLAGS again
Applied, thanks.