From 8f2e16767cc17add50f60a8b7e554f76321badfe Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sat, 4 May 2013 11:53:13 +0200
Subject: [PATCH] Move recordmydesktop from abrt-desktop's dep chain to comps

This complements the libreport change to drop the hard Requires:
recordmydesktop. Instead, install recordmydesktop through comps so that
individual spins could choose if they want recordmydesktop shipped on
the live media / installed by default.

recordmydesktop used to be pulled in through the abrt-desktop ->
libreport -> recordmydesktop dep chain. I'm now adding it to comps for
all the spins that previously pulled it in through the abrt-desktop dep
chain ...

... except for the Desktop spin. GNOME Shell already has built-in screen
recording functionality and recordmydesktop would duplicate that.

https://bugzilla.redhat.com/show_bug.cgi?id=959475
https://bugzilla.gnome.org/show_bug.cgi?id=696247
---
 comps-f19.xml.in | 4 ++++
 comps-f20.xml.in | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index b1d59c25..99bcc280 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -231,6 +231,7 @@
       <packagereq>akonadi</packagereq>
       <packagereq>akonadi-mysql</packagereq>
       <packagereq>appmenu-qt</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>apper</packagereq>
       <packagereq>ark</packagereq>
@@ -398,6 +399,7 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>alsa-utils</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>desktop-backgrounds-compat</packagereq>
       <packagereq>Thunar</packagereq>
@@ -558,6 +560,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>lxde-common</packagereq>
       <packagereq>lxmenu-data</packagereq>
@@ -723,6 +726,7 @@
       <packagereq>gnome-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>firewall-config</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index c632e136..5b2d85ca 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -232,6 +232,7 @@
       <packagereq>akonadi</packagereq>
       <packagereq>akonadi-mysql</packagereq>
       <packagereq>appmenu-qt</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>apper</packagereq>
       <packagereq>ark</packagereq>
@@ -399,6 +400,7 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>alsa-utils</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>desktop-backgrounds-compat</packagereq>
       <packagereq>Thunar</packagereq>
@@ -559,6 +561,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>lxde-common</packagereq>
       <packagereq>lxmenu-data</packagereq>
@@ -724,6 +727,7 @@
       <packagereq>gnome-packagekit</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>firewall-config</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
@@ -4164,6 +4168,7 @@
       <packagereq>lightdm</packagereq>
       <packagereq>initial-setup</packagereq>
       <packagereq>abrt-desktop</packagereq>
+      <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>ConsoleKit-x11</packagereq>
       <packagereq>libmate</packagereq>