rpms/fedora-package-config-apt/FC-6 fedora-package-config-apt.spec, 1.3, 1.4 fedora.conf, 1.2, 1.3

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14817/FC-6

Modified Files:
	fedora-package-config-apt.spec fedora.conf 
Log Message:
Try to fix #215260.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-6/fedora-package-config-apt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-package-config-apt.spec	30 Aug 2006 00:27:39 -0000	1.3
+++ fedora-package-config-apt.spec	23 Nov 2006 17:28:16 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
-Version: 5.92
-Release: 4
+Version: 6
+Release: 5
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Thu Nov 23 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 6-5
+- Add xen and PAE to possible kernel flavours.
+
 * Sat May 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
 - Move some FC specific config bits from apt.
 


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-6/fedora.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora.conf	20 May 2006 16:55:18 -0000	1.2
+++ fedora.conf	23 Nov 2006 17:28:16 -0000	1.3
@@ -20,14 +20,14 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+    "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };
   // XXX: not used currently
   //Allow-Duplicated-Upgrade {
-  //  "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
-  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+  //  "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
   //  "^kmod-.+$";
   //  "^gpg-pubkey$";
   //};