3 commits - comps-f13.xml.in comps-f14.xml.in

[Rex Dieter]

 comps-f13.xml.in |    5 ++++-
 comps-f14.xml.in |    2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2f876b061299b4f8852a3d4e72d8bb986e55749a
Merge: 7167710... 075d3c1...
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Apr 30 07:39:19 2010 -0500

    Merge branch 'master' of ssh://git.fedorahosted.org/git/comps



commit 7167710e48f0306fadb5d5296f704b1710170ee2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Apr 30 07:37:50 2010 -0500

    add pinentry conditionals to help get the right guis for
    particular -desktops (#587337)

diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index 7b5434f..956bf3b 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -2604,6 +2604,7 @@
       <packagereq type="mandatory">polkit-gnome</packagereq>
       <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="conditional" requires="ibus">ibus-gtk</packagereq>
+      <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-gtk</packagereq>
       <packagereq type="default">at-spi</packagereq>
       <packagereq type="default">brasero-nautilus</packagereq>
@@ -3791,6 +3792,7 @@
       <packagereq type="mandatory">kdelibs</packagereq>
       <packagereq type="conditional" requires="gstreamer">gstreamer-plugins-good</packagereq>
       <packagereq type="conditional" requires="ibus">ibus-qt</packagereq>
+      <packagereq type="conditional" requires="pinentry">pinentry-qt4</packagereq>
       <packagereq type="conditional" requires="scim">scim-bridge-qt</packagereq>
       <packagereq type="default">amarok</packagereq>
       <packagereq type="default">cups-pk-helper</packagereq>
@@ -3825,7 +3827,6 @@
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">phonon-backend-gstreamer</packagereq>
       <packagereq type="default">phonon-backend-xine</packagereq>
-      <packagereq type="default">pinentry-qt4</packagereq>
       <packagereq type="default">qtcurve-gtk2</packagereq>
       <packagereq type="default">qtcurve-kde4</packagereq>
       <packagereq type="default">scribus</packagereq>
@@ -4259,6 +4260,7 @@
       <packagereq type="mandatory">lxsession</packagereq>
       <packagereq type="mandatory">openbox</packagereq>
       <packagereq type="mandatory">pcmanfm</packagereq>
+      <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
       <packagereq type="default">gpicview</packagereq>
       <packagereq type="default">leafpad</packagereq>
       <packagereq type="default">lxappearance</packagereq>
@@ -6387,6 +6389,7 @@
       <packagereq type="mandatory">xfdesktop</packagereq>
       <packagereq type="mandatory">xfwm4</packagereq>
       <packagereq type="conditional" requires="imsettings">imsettings-xfce</packagereq>
+      <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
       <packagereq type="default">gdm</packagereq>
       <packagereq type="default">mousepad</packagereq>
       <packagereq type="default">orage</packagereq>


commit 7699fc1f190187b9fa131dd2bbffb17214385988
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Apr 30 07:27:07 2010 -0500

    pinentry conditionals for lxde xfce too (#587337)

diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index ca2a9e1..a0eda0e 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -4182,6 +4182,7 @@
       <packagereq type="mandatory">lxsession</packagereq>
       <packagereq type="mandatory">openbox</packagereq>
       <packagereq type="mandatory">pcmanfm</packagereq>
+      <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
       <packagereq type="default">gpicview</packagereq>
       <packagereq type="default">leafpad</packagereq>
       <packagereq type="default">lxappearance</packagereq>
@@ -6299,6 +6300,7 @@
       <packagereq type="mandatory">xfdesktop</packagereq>
       <packagereq type="mandatory">xfwm4</packagereq>
       <packagereq type="conditional" requires="imsettings">imsettings-xfce</packagereq>
+      <packagereq type="conditional" requires="pinentry">pinentry-gtk</packagereq>
       <packagereq type="default">gdm</packagereq>
       <packagereq type="default">mousepad</packagereq>
       <packagereq type="default">orage</packagereq>