old_contents: #
  # Copyright (c) 2006 rPath, Inc.
  # All Rights Reserved
  #
  
  stockFlavors = {
      "1#x86":
          "~MySQL-python.threadsafe, X, ~!alternatives, ~!bootstrap,"
          "~!builddocs, ~buildtests, desktop, dietlibc, emacs, gcj,"
          "~glibc.tls, gnome, ~!grub.static, gtk, ipv6, kde,"
          "~!kernel.debug, ~!kernel.debugdata, ~!kernel.numa, krb, ldap,"
          "nptl, ~!openssh.smartcard, ~!openssh.static_libcrypto, pam,"
          "pcre, perl, ~!pie, ~!postfix.mysql, python, qt, readline,"
          "sasl, ~!selinux, ~sqlite.threadsafe, ssl, tcl, tcpwrappers,"
          "tk, ~!xorg-x11.xprint is: x86(cmov, i486, i586, i686, ~!mmx,"
          "~!sse2)",
  
      "1#x86_64":
                  "~MySQL-python.threadsafe,X,~!alternatives,~!bootstrap,"
                  "~!builddocs,~buildtests,desktop,~!dietlibc,emacs,gcj,"
                  "~glibc.tls,gnome,~grub.static,gtk,ipv6,kde,~!kernel.debug,"
                  "~!kernel.debugdata,~!kernel.numa,krb,ldap,nptl,"
                  "~!openssh.smartcard,~!openssh.static_libcrypto,pam,pcre,"
                  "perl,~!pie,~!postfix.mysql,python,qt,readline,sasl,"
                  "~!selinux,~sqlite.threadsafe,ssl,tcl,tcpwrappers,tk,"
                  "~!xorg-x11.xprint is: x86(i486,i586,i686,~!sse2) x86_64",
  }
  
new_contents: #
  # Copyright (c) 2006 rPath, Inc.
  # All Rights Reserved
  #
  
  stockFlavors = {
      "1#x86":
          "~MySQL-python.threadsafe, X, ~!alternatives, ~!bootstrap,"
          "~!builddocs, ~buildtests, desktop, dietlibc, emacs, gcj,"
          "~glibc.tls, gnome, ~!grub.static, gtk, ipv6, kde,"
          "~!kernel.debug, ~!kernel.debugdata, ~!kernel.numa, krb, ldap,"
          "nptl, ~!openssh.smartcard, ~!openssh.static_libcrypto, pam,"
          "pcre, perl, ~!pie, ~!postfix.mysql, python, qt, readline,"
          "sasl, ~!selinux, ~sqlite.threadsafe, ssl, tcl, tcpwrappers,"
          "tk, ~!xorg-x11.xprint is: x86(~cmov, ~i486, ~i586, ~i686, ~!mmx,"
          "~!sse2)",
  
      "1#x86_64":
                  "~MySQL-python.threadsafe,X,~!alternatives,~!bootstrap,"
                  "~!builddocs,~buildtests,desktop,~!dietlibc,emacs,gcj,"
                  "~glibc.tls,gnome,~grub.static,gtk,ipv6,kde,~!kernel.debug,"
                  "~!kernel.debugdata,~!kernel.numa,krb,ldap,nptl,"
                  "~!openssh.smartcard,~!openssh.static_libcrypto,pam,pcre,"
                  "perl,~!pie,~!postfix.mysql,python,qt,readline,sasl,"
                  "~!selinux,~sqlite.threadsafe,ssl,tcl,tcpwrappers,tk,"
                  "~!xorg-x11.xprint is: x86(~i486,~i586,~i686,~!sse2) x86_64",
  }
  
subject: fix up group flavors to not require all CPU modifiers