From 9e6dd4f08c428982163ce42e46f5496fcb75fb8c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: May 16 2016 15:20:51 +0000
Subject: Set xorg-x11-drv-geode to optional so it doesn't pull glibc.i686 into

x86_64 workstation composes. Hopefully fixes rhbz 1334478

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---

diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index e5c1606..3481a7e 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -313,7 +313,6 @@
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
       <packagereq>xorg-x11-drv-freedreno</packagereq>
-      <packagereq>xorg-x11-drv-geode</packagereq>
       <packagereq>xorg-x11-drv-intel</packagereq>
       <packagereq>xorg-x11-drv-mga</packagereq>
       <packagereq>xorg-x11-drv-modesetting</packagereq>
@@ -330,6 +329,7 @@
       <packagereq>xorg-x11-utils</packagereq>
       <packagereq>xorg-x11-xauth</packagereq>
       <packagereq>xorg-x11-xinit</packagereq>
+      <packagereq type="optional">xorg-x11-drv-geode</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index 1a14360..290678e 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -313,7 +313,6 @@
       <packagereq>xorg-x11-drv-evdev</packagereq>
       <packagereq>xorg-x11-drv-fbdev</packagereq>
       <packagereq>xorg-x11-drv-freedreno</packagereq>
-      <packagereq>xorg-x11-drv-geode</packagereq>
       <packagereq>xorg-x11-drv-intel</packagereq>
       <packagereq>xorg-x11-drv-mga</packagereq>
       <packagereq>xorg-x11-drv-modesetting</packagereq>
@@ -330,6 +329,7 @@
       <packagereq>xorg-x11-utils</packagereq>
       <packagereq>xorg-x11-xauth</packagereq>
       <packagereq>xorg-x11-xinit</packagereq>
+      <packagereq type="optional">xorg-x11-drv-geode</packagereq>
     </packagelist>
   </group>
   <group>