Author: glen Date: Tue Feb 12 08:30:01 2008 GMT Module: SPECS Tag: LINUX_2_6_16 ---- Log message: - R: /sbin/depmod, instead of conflicting on vserver-packages
---- Files affected: SPECS: kernel.spec (1.441.2.1558.2.131 -> 1.441.2.1558.2.132) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1558.2.131 SPECS/kernel.spec:1.441.2.1558.2.132 --- SPECS/kernel.spec:1.441.2.1558.2.131 Mon Feb 11 20:15:39 2008 +++ SPECS/kernel.spec Tue Feb 12 09:29:55 2008 @@ -279,8 +279,8 @@ Patch83: linux-tg3-3.81c.patch # IPSEC KLIPS -Patch90: http://www.openswan.org/download/openswan-2.4.9.kernel-2.6-klips.patch.gz -Patch91: http://www.openswan.org/download/openswan-2.4.9.kernel-2.6-natt.patch.gz +Patch90: http://www.openswan.org/download/openswan-2.4.9.kernel-2.6-klips.patch.gz +Patch91: http://www.openswan.org/download/openswan-2.4.9.kernel-2.6-natt.patch.gz Patch92: linux-asm_segment_h.patch # vserver from: http://vserver.13thfloor.at/Experimental/patch-2.6.16-vs2.1.1-rc15.diff @@ -340,11 +340,12 @@ Requires(post): coreutils Requires(post): geninitrd >= 2.57 Requires(post): module-init-tools >= 0.9.9 +Requires: /sbin/depmod Requires: coreutils Requires: geninitrd >= 2.57 Requires: module-init-tools >= 0.9.9 -Provides: %{name}-up = %{epoch}:%{version}-%{release} Provides: %{name}(netfilter) = %{netfilter_snap} +Provides: %{name}-up = %{epoch}:%{version}-%{release} %if %{with xen0} Provides: kernel(xen0) = %{xen_version} %endif @@ -368,7 +369,6 @@ Conflicts: reiserfsprogs < %{_reiserfsprogs_ver} Conflicts: udev < %{_udev_ver} Conflicts: util-linux < %{_util_linux_ver} -Conflicts: vserver-packages Conflicts: xfsprogs < %{_xfsprogs_ver} %if %{with xen0} || %{with xenU} ExclusiveArch: %{ix86} %{x8664} @@ -562,6 +562,7 @@ Requires(post): coreutils Requires(post): geninitrd >= 2.57 Requires(post): module-init-tools >= 0.9.9 +Requires: /sbin/depmod Requires: coreutils Requires: geninitrd >= 2.26 Requires: module-init-tools >= 0.9.9 @@ -587,7 +588,6 @@ %endif Conflicts: reiserfsprogs < %{_reiserfsprogs_ver} Conflicts: util-linux < %{_util_linux_ver} -Conflicts: vserver-packages Conflicts: xfsprogs < %{_xfsprogs_ver} Autoreqprov: no @@ -1809,6 +1809,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1558.2.132 2008-02-12 08:29:55 glen +- R: /sbin/depmod, instead of conflicting on vserver-packages + Revision 1.441.2.1558.2.131 2008-02-11 19:15:39 zbyniu - kernel-CVE-2008-0163.patch added, rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1558.2.131&r2=1.441.2.1558.2.132&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
