Update multilib configuration to exclude httpd-core rather than
httpd from being treated as multilib, since the conflicting i686/x86_64 packages were moved to httpd-core. Signed-off-by: Joe Orton <jorton@redhat.com>
This commit is contained in:
parent
ebd9d9f3f1
commit
7fb802c8eb
@ -119,7 +119,7 @@ multilib_blacklist = {
|
|||||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||||
'php-devel', 'java-*',
|
'php-devel', 'java-*',
|
||||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
'httpd-devel', 'tomcat-native', 'php*', 'httpd-core',
|
||||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
|
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
|
||||||
'mp'
|
'mp'
|
||||||
],
|
],
|
||||||
|
@ -119,7 +119,7 @@ multilib_blacklist = {
|
|||||||
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
|
||||||
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
|
||||||
'php-devel', 'java-*',
|
'php-devel', 'java-*',
|
||||||
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
|
'httpd-devel', 'tomcat-native', 'php*', 'httpd-core',
|
||||||
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
|
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
|
||||||
'mp'
|
'mp'
|
||||||
],
|
],
|
||||||
|
@ -213,7 +213,7 @@ multilib_blacklist = {
|
|||||||
'bash-devel',
|
'bash-devel',
|
||||||
'dmraid-devel',
|
'dmraid-devel',
|
||||||
'ghc-*',
|
'ghc-*',
|
||||||
'httpd',
|
'httpd-core',
|
||||||
'httpd-devel',
|
'httpd-devel',
|
||||||
'java-*',
|
'java-*',
|
||||||
'kdeutils-devel',
|
'kdeutils-devel',
|
||||||
|
Loading…
Reference in New Issue
Block a user