Replace the glibc-headers package with glibc-headers-x86
    
    And make it noarch.  This avoids compose issues with disappearing
    and reappearing glibc-headers.i686 packages.
    
    Also add a glibc-headers-s390 package on s390x, in case someone
    still has a private build with the 31-bit libraries.