rpms/apt/devel apt.spec,1.19,1.20 default.conf,1.6,1.7

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	apt.spec default.conf 
Log Message:
* Sun Mar 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre1
- Fix Allow-Duplicated* default.conf bugs introduced in previous version.



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- apt.spec	19 Mar 2006 20:52:50 -0000	1.19
+++ apt.spec	19 Mar 2006 21:21:54 -0000	1.20
@@ -6,7 +6,7 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.1.pre1%{?dist}
+Release:        0.2.pre1%{?dist}
 Group:          System Environment/Base
 URL:            https://moin.conectiva.com.br/AptRpm
 License:        GPL
@@ -322,6 +322,9 @@
 
 
 %changelog
+* Sun Mar 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre1
+- Fix Allow-Duplicated* default.conf bugs introduced in previous version.
+
 * Sun Mar 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.1.pre1
 - 0.5.15lorg3-pre1: preliminary multilib and repomd support.
 - Update config for kernel and module packages.


Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.conf	19 Mar 2006 20:52:50 -0000	1.6
+++ default.conf	19 Mar 2006 21:21:54 -0000	1.7
@@ -27,15 +27,15 @@
   Ignore { "gpg-pubkey"; };
   // 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[0U]))?(-devel)?$";
+    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
     "^kmod-.+$";
     "^gpg-pubkey$";
   };
   // 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[0U]))?(-devel)?$";
+  //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
   //  "^kmod-.+$";
   //  "^gpg-pubkey$";
   //};