diff --git a/apt.spec b/apt.spec index 0b93b0d..81b74e0 100644 --- a/apt.spec +++ b/apt.spec @@ -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 @@ fi %changelog +* Sun Mar 19 2006 Ville Skyttä - 0.5.15lorg3-0.2.pre1 +- Fix Allow-Duplicated* default.conf bugs introduced in previous version. + * Sun Mar 19 2006 Ville Skyttä - 0.5.15lorg3-0.1.pre1 - 0.5.15lorg3-pre1: preliminary multilib and repomd support. - Update config for kernel and module packages. diff --git a/default.conf b/default.conf index d292bdc..180fd0a 100644 --- a/default.conf +++ b/default.conf @@ -27,15 +27,15 @@ RPM 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$"; //};