Author: qboosh Date: Thu Oct 12 20:47:35 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- with any-any-update kernel modules can be in different version, dropped even
Conflicts
---- Files affected:
SPECS:
VMware-player.spec (1.7 -> 1.8) , VMware-server.spec (1.19 -> 1.20) ,
VMware-workstation.spec (1.95 -> 1.96)
---- Diffs:
================================================================
Index: SPECS/VMware-player.spec
diff -u SPECS/VMware-player.spec:1.7 SPECS/VMware-player.spec:1.8
--- SPECS/VMware-player.spec:1.7 Thu Oct 5 16:00:29 2006
+++ SPECS/VMware-player.spec Thu Oct 12 22:47:30 2006
@@ -1,4 +1,5 @@
# $Revision$, $Date$
+#
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
%bcond_without kernel # don't build kernel modules
@@ -51,8 +52,6 @@
BuildRequires: sed >= 4.0
Requires: libgnomecanvasmm
Requires: libview >= 0.5.5-2
-Conflicts: kernel(vmmon) < %{version}-%{_rel}
-Conflicts: kernel(vmmon) > %{version}-%{_rel}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -103,8 +102,6 @@
Requires: %{name} = %{version}-%{release}
Requires: rc-scripts
Obsoletes: VMware-Player-samba
-Conflicts: kernel(vmnet) < %{version}-%{_rel}
-Conflicts: kernel(vmnet) > %{version}-%{_rel}
%description networking
VMware networking utilities.
@@ -633,6 +630,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2006/10/12 20:47:30 qboosh
+- with any-any-update kernel modules can be in different version, dropped even
Conflicts
+
Revision 1.7 2006/10/05 14:00:29 qboosh
- package EULA.txt in vmware/share dir (needed to run vmplayer)
================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.19 SPECS/VMware-server.spec:1.20
--- SPECS/VMware-server.spec:1.19 Thu Oct 5 15:57:37 2006
+++ SPECS/VMware-server.spec Thu Oct 12 22:47:30 2006
@@ -68,8 +68,6 @@
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
Requires: libgnomecanvasmm
-Conflicts: kernel(vmmon) < %{version}-%{_rel}
-Conflicts: kernel(vmmon) > %{version}-%{_rel}
ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -144,8 +142,6 @@
Requires(post,preun): /sbin/chkconfig
#Requires: %{name} = %{version}-%{release}
Requires: rc-scripts
-Conflicts: kernel(vmnet) < %{version}-%{_rel}
-Conflicts: kernel(vmnet) > %{version}-%{_rel}
%description networking
VMware networking utilities.
@@ -773,6 +769,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2006/10/12 20:47:30 qboosh
+- with any-any-update kernel modules can be in different version, dropped even
Conflicts
+
Revision 1.19 2006/10/05 13:57:37 qboosh
- don't require kernel modules in userspace apps (think about chroots)
================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.95 SPECS/VMware-workstation.spec:1.96
--- SPECS/VMware-workstation.spec:1.95 Thu Oct 5 15:57:37 2006
+++ SPECS/VMware-workstation.spec Thu Oct 12 22:47:30 2006
@@ -60,8 +60,6 @@
BuildRequires: sed >= 4.0
Requires: libgnomecanvasmm
Requires: libview >= 0.5.5-2
-Conflicts: kernel(vmmon) < %{version}-%{_rel}
-Conflicts: kernel(vmmon) > %{version}-%{_rel}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -112,8 +110,6 @@
Requires: %{name} = %{version}-%{release}
Requires: rc-scripts
Obsoletes: VMware-workstation-samba
-Conflicts: kernel(vmnet) < %{version}-%{_rel}
-Conflicts: kernel(vmnet) > %{version}-%{_rel}
%description networking
VMware networking utilities.
@@ -669,6 +665,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.96 2006/10/12 20:47:30 qboosh
+- with any-any-update kernel modules can be in different version, dropped even
Conflicts
+
Revision 1.95 2006/10/05 13:57:37 qboosh
- don't require kernel modules in userspace apps (think about chroots)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/VMware-player.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SPECS/VMware-server.spec?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.95&r2=1.96&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
