CentOS 8 compatibility substitutions

mpcdf_common.py

@@ -61,15 +61,18 @@ def dist_prjconf_tags(distribution):
 
     centos8_prjconf_tags = textwrap.dedent(
         """
+        Substitute: python python3
         Substitute: python-devel python3-devel
         ExpandFlags: module:python36-3.6
+        # Remove redhat-hardened-cc1 and redhat-annobin-cc1 spec
+        Optflags: x86_64 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -m64 -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
         """).strip()
 
     sles15_prjconf_tags = textwrap.dedent(
         """
         %if "%{_repository}" == "gcc_6" || "%{_repository}" == "gcc_7"
         # gcc6/7 cannot deal with "-fstack-clash-protection" that has been added in SLE15 by default
-        Optflags: * -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
+        Optflags: x86_64 -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables
         %endif
         """
     ).strip()