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

[Axel Thimm (athimm)]

Author: athimm

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

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


--- NEW FILE fedora-devel.list ---
# Fedora development
# repomd http://download.fedora.redhat.com/pub/ fedora/linux/development/$(ARCH)/os/

# Debug packages
# repomd http://download.fedora.redhat.com/pub/ fedora/linux//Everything/$(ARCH)/debug/

# sources
#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/development/source/SRPMS/


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-7/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	3 Jun 2007 08:33:49 -0000	1.6
+++ fedora-package-config-apt.spec	22 Mar 2008 13:55:54 -0000	1.7
@@ -1,14 +1,15 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
 Version: 7
-Release: 7.1
+Release: 7.2
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 
 # 100-149 for sources.list.d
 Source100:      fedora.list
-Source102:      fedora-updates.list
+Source101:      fedora-updates.list
+Source102:      fedora-devel.list
 
 # 150-199 for apt.conf.d
 # additional "factory defaults" for fedora
@@ -43,7 +44,7 @@
   %{buildroot}%{_sysconfdir}/apt/vendors.list.d/fedora.list
 
 # Default source list entries
-for source in %{SOURCE100} %{SOURCE102}; do
+for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
   install -pm 644 $source %{buildroot}%{_sysconfdir}/apt/sources.list.d/
 done
 
@@ -61,6 +62,9 @@
 
 
 %changelog
+* Sat Mar 22 2008 Axel Thimm <Axel.Thimm at ATrpms.net> - 7-7.2
+- Add separate sourcelist for development repository (disabled)
+
 * Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 7-7.1
 - Fix URLs for F7.
 


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-7/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:55:54 -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-.+$";
   };