rpms/apt/devel apt.spec,1.6,1.7 default.conf,1.3,1.4

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	apt.spec default.conf 
Log Message:
Allow-Duplicated += kernel-xen*, kernel-*-devel.


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apt.spec	23 Jan 2005 18:22:45 -0000	1.6
+++ apt.spec	28 Jan 2005 21:13:08 -0000	1.7
@@ -17,7 +17,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt
 Version: 0.5.15cnc6
-Release: 13.%{svnver}
+Release: 14.%{svnver}
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -360,6 +360,10 @@
 
 
 %changelog
+* Fri Jan 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc6-14.r362
+- Add xen kernels and more kernel-*-devel variants to Allow-Duplicated in
+  apt.conf.d/default.conf.
+
 * 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.
 


Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.conf	23 Jan 2005 18:22:45 -0000	1.3
+++ default.conf	28 Jan 2005 21:13:08 -0000	1.4
@@ -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|devel))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; };
+  Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; "^gpg-pubkey$"; };
   // XXX: not used currently
-  //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode|devel))?(-(unsupported-modules))?$"; };
+  //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; };
   // "Upgrade" allow-duplicated packages as well
   Upgrade-Virtual "true";
   // Enable source rebuilds