rpms/apt/devel apt.spec,1.5,1.6 default.conf,1.2,1.3

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv13056

Modified Files:
	apt.spec default.conf 
Log Message:
Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apt.spec	17 Jan 2005 22:01:26 -0000	1.5
+++ apt.spec	23 Jan 2005 18:22:45 -0000	1.6
@@ -17,7 +17,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt
 Version: 0.5.15cnc6
-Release: 12.%{svnver}
+Release: 13.%{svnver}
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -360,6 +360,9 @@
 
 
 %changelog
+* Sun Jan 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc6-13.r362
+- Add kernel-devel to Allow-Duplicated in apt.conf.d/default.conf.
+
 * Mon Jan 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc6-12.r362
 - Clean up -python packaging, make everything honor %%{__python}.
 - Build with dependency tracking disabled.


Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.conf	17 Jan 2005 22:01:26 -0000	1.2
+++ default.conf	23 Jan 2005 18:22:45 -0000	1.3
@@ -26,9 +26,9 @@
   // Completely ignore GnuPG signature packages (introduced in rpm 4.1)
   Ignore { "gpg-pubkey"; };
   // Allow multiple kernel and kernel-related packages to be installed
-  Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; };
+  Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; };
   // XXX: not used currently
-  //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; };
+  //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; };
   // "Upgrade" allow-duplicated packages as well
   Upgrade-Virtual "true";
   // Enable source rebuilds