rpms/fedora-package-config-apt/devel fedora-package-config-apt.spec, 1.6, 1.7 fedora.conf, 1.3, 1.4 fedora-extras.list, 1.1, NONE

Axel Thimm (athimm) fedora-extras-commits at redhat.com
Sat Mar 22 13:57:50 UTC 2008


Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014/fedora-package-config-apt/devel

Modified Files:
	fedora-package-config-apt.spec fedora.conf 
Removed Files:
	fedora-extras.list 
Log Message:
Sync fixes across releases, simplify switching to and from rawhide, (prepare for GA)


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora-package-config-apt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-package-config-apt.spec	16 Nov 2007 06:34:38 -0000	1.6
+++ fedora-package-config-apt.spec	22 Mar 2008 13:56:34 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
-Version: 8.89
+Version: 8.92
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -9,7 +9,7 @@
 # 100-149 for sources.list.d
 Source100:      fedora.list
 Source101:      fedora-updates.list
-Source102:	fedora-devel.list
+Source102:      fedora-devel.list
 
 # 150-199 for apt.conf.d
 # additional "factory defaults" for fedora


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/devel/fedora.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora.conf	23 Nov 2006 17:28:16 -0000	1.3
+++ fedora.conf	22 Mar 2008 13:56:34 -0000	1.4
@@ -20,7 +20,7 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^kernel(|-suspend2|-tuxonice)(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
     "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };


--- fedora-extras.list DELETED ---




More information about the fedora-extras-commits mailing list