comps comps-fe7.xml.in,1.119,1.120

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17640

Modified Files:
	comps-fe7.xml.in 
Log Message:
Make some things default we'd like to have default.
Add NetworkManager-openvpn



Index: comps-fe7.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe7.xml.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- comps-fe7.xml.in	5 Mar 2007 09:14:51 -0000	1.119
+++ comps-fe7.xml.in	5 Mar 2007 22:25:02 -0000	1.120
@@ -859,10 +859,11 @@
       <packagereq type="optional">jabberd</packagereq>
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">l2tpd</packagereq>
-      <packagereq type="optional">NetworkManager-vpnc</packagereq>
+      <packagereq type="default">NetworkManager-openvpn</packagereq>
+      <packagereq type="default">NetworkManager-vpnc</packagereq>
       <packagereq type="optional">nsd</packagereq>
       <packagereq type="optional">oidentd</packagereq>
-      <packagereq type="optional">openvpn</packagereq>
+      <packagereq type="default">openvpn</packagereq>
       <packagereq type="optional">puppet-server</packagereq>
       <packagereq type="optional">rbldnsd</packagereq>
       <packagereq type="optional">rinetd</packagereq>
@@ -1097,7 +1098,7 @@
       <packagereq type="optional">upx</packagereq>
       <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vnstat</packagereq>
-      <packagereq type="optional">vpnc</packagereq>
+      <packagereq type="default">vpnc</packagereq>
       <packagereq type="optional">wifiroamd</packagereq>
       <packagereq type="optional">wine</packagereq>
       <packagereq type="optional">wlassistant</packagereq>