rpms/fedora-package-config-apt/FC-5 fedora-package-config-apt.spec, 1.1, 1.2 fedora.conf, 1.1, 1.2
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Mon May 22 18:56:18 UTC 2006
Author: athimm
Update of /cvs/extras/rpms/fedora-package-config-apt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13850/FC-5
Modified Files:
fedora-package-config-apt.spec fedora.conf
Log Message:
FC-5 and FC-4 builds.
Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-5/fedora-package-config-apt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-package-config-apt.spec 13 May 2006 01:34:07 -0000 1.1
+++ fedora-package-config-apt.spec 22 May 2006 18:56:18 -0000 1.2
@@ -1,7 +1,7 @@
Summary: Fedora configuration files for the apt-rpm package manager
Name: fedora-package-config-apt
-Version: 5.89
-Release: 3
+Version: 5
+Release: 4
License: GPL
Group: System Environment/Base
URL: http://fedora.redhat.com/
@@ -62,6 +62,9 @@
%changelog
+* Sat May 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Move some FC specific config bits from apt.
+
* Thu May 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-3
- Apply comments from review #191040c3 (by Ville).
- Fix summary and description
Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/FC-5/fedora.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora.conf 13 May 2006 01:34:07 -0000 1.1
+++ fedora.conf 22 May 2006 18:56:18 -0000 1.2
@@ -13,3 +13,24 @@
{
http::User-Agent "Fedora APT-HTTP/1.3";
};
+
+RPM
+{
+ // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades)
+ Order "true";
+ // 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]))?$";
+ "^kmod-.+$";
+ };
+ // XXX: not used currently
+ //Allow-Duplicated-Upgrade {
+ // "^kernel(-(hugemem|kdump|smp|xen[0U]))?(-devel)?$";
+ // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$";
+ // "^kmod-.+$";
+ // "^gpg-pubkey$";
+ //};
+ // "Upgrade" allow-duplicated packages as well
+ Upgrade-Virtual "true";
+}
More information about the fedora-extras-commits
mailing list