From 36aa53fa5cf5b77506577012e8a1da50277cbb1b Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 13 Sep 2012 14:29:21 -0400
Subject: [PATCH] Fix the multimedia problem on basic-xwindows slightly
 differently - have it included, but drop pulseaudio-module-bluetooth from the
 group.

pulseaudio-module-bluetooth requires (indirectly, via bluez) a PIN query agent,
such as bluedevil, gnome-bluetooth, or blueman. Since bluedevil and
gnome-bluetooth already require pulseaudio-module-bluetooth, drop it from
@multimedia, and the desktop environments can bring it in indirectly. Bug
filed against blueman to also add this requirement.
---
 comps-f18.xml.in | 3 +--
 comps-f19.xml.in | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 0b456b6d..21e342db 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -48,7 +48,6 @@
       <packagereq>alsa-utils</packagereq>
       <packagereq>alsa-plugins-pulseaudio</packagereq>
       <packagereq>pulseaudio</packagereq>
-      <packagereq>pulseaudio-module-bluetooth</packagereq>
       <packagereq>pulseaudio-utils</packagereq>
       <packagereq>pulseaudio-module-x11</packagereq>
     </packagelist>
@@ -5930,12 +5929,12 @@
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
+      <groupid>multimedia</groupid>
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
-      <groupid>multimedia</groupid>
       <groupid>xmonad</groupid>
     </optionlist>
   </environment>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 3fc771d3..980812b5 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -48,7 +48,6 @@
       <packagereq>alsa-utils</packagereq>
       <packagereq>alsa-plugins-pulseaudio</packagereq>
       <packagereq>pulseaudio</packagereq>
-      <packagereq>pulseaudio-module-bluetooth</packagereq>
       <packagereq>pulseaudio-utils</packagereq>
       <packagereq>pulseaudio-module-x11</packagereq>
     </packagelist>