Author: qboosh Date: Thu Mar 16 11:19:14 2006 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- ppp Conflicts fixed to match existing package
---- Files affected:
SPECS:
kernel.spec (1.441.2.1414 -> 1.441.2.1415)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1414 SPECS/kernel.spec:1.441.2.1415
--- SPECS/kernel.spec:1.441.2.1414 Tue Mar 14 16:04:26 2006
+++ SPECS/kernel.spec Thu Mar 16 12:19:08 2006
@@ -139,7 +139,7 @@
%define _pcmcia_cs_ver 3.1.21
%define _pcmciautils_ver 004
%define _quota_tools_ver 3.09
-%define _PPP_ver 2.4.0
+%define _ppp_ver 1:2.4.0
%define _isdn4k_utils_ver 3.1pre1
%define _nfs_utils_ver 1.0.5
%define _procps_ver 3.2.0
@@ -401,13 +401,13 @@
Obsoletes: kernel-net-hostap
Obsoletes: kernel-net-ieee80211
Obsoletes: kernel-net-ipp2p
-Conflicts: PPP < %{_PPP_ver}
Conflicts: e2fsprogs < %{_e2fsprogs_ver}
Conflicts: isdn4k-utils < %{_isdn4k_utils_ver}
Conflicts: jfsutils < %{_jfsutils_ver}
Conflicts: module-init-tool < %{_module_init_tool_ver}
Conflicts: nfs-utils < %{_nfs_utils_ver}
Conflicts: oprofile < %{_oprofile_ver}
+Conflicts: ppp < %{_ppp_ver}
Conflicts: procps < %{_procps_ver}
Conflicts: quota-tools < %{_quota_tools_ver}
Conflicts: reiser4progs < %{_reiser4progs_ver}
@@ -567,13 +567,13 @@
Obsoletes: kernel-smp-net-hostap
Obsoletes: kernel-smp-net-ieee80211
Obsoletes: kernel-smp-net-ipp2p
-Conflicts: PPP < %{_PPP_ver}
Conflicts: e2fsprogs < %{_e2fsprogs_ver}
Conflicts: isdn4k-utils < %{_isdn4k_utils_ver}
Conflicts: jfsutils < %{_jfsutils_ver}
Conflicts: module-init-tool < %{_module_init_tool_ver}
Conflicts: nfs-utils < %{_nfs_utils_ver}
Conflicts: oprofile < %{_oprofile_ver}
+Conflicts: ppp < %{_ppp_ver}
Conflicts: procps < %{_procps_ver}
Conflicts: quota-tools < %{_quota_tools_ver}
Conflicts: reiserfsprogs < %{_reiserfsprogs_ver}
@@ -1847,6 +1847,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1415 2006/03/16 11:19:08 qboosh
+- ppp Conflicts fixed to match existing package
+
Revision 1.441.2.1414 2006/03/14 15:04:26 qboosh
- removed obsolete 3C920b-Tornado patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1414&r2=1.441.2.1415&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
