From abb246d0656e7966fba5dade26857a0fd094527a Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Apr 29 2015 18:20:29 +0000
Subject: blacklist php and httpd from being multilib rhbz#1217168


Signed-off-by: Dennis Gilmore <dennis@ausil.us>

---

diff --git a/mash/config.py b/mash/config.py
index e1ffbd6..91345dc 100644
--- a/mash/config.py
+++ b/mash/config.py
@@ -35,6 +35,7 @@ class MashConfig(config.BaseConfig):
         'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
         'php-devel', 'java-1.6.0-openjdk-devel',
         'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
+        'httpd-devel',
     ])
     multilib_runtime_whitelist = config.ListOption([
         'libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
@@ -42,7 +43,9 @@ class MashConfig(config.BaseConfig):
         'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
         'syslinux-tftpboot',
     ])
-    multilib_runtime_blacklist = config.ListOption(['tomcat-native'])
+    multilib_runtime_blacklist = config.ListOption(['tomcat-native',
+        'php', 'httpd',
+    ])
     arches = config.ListOption()
     keys = config.ListOption()
     configdir = config.Option('/etc/mash')