SPECS: VMware-workstation.spec - alternative kernel support

sparky sparky at pld-linux.org
Sat Jun 24 17:01:45 CEST 2006 

Author: sparky                       Date: Sat Jun 24 15:01:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alternative kernel support

---- Files affected:
SPECS:
   VMware-workstation.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.90 SPECS/VMware-workstation.spec:1.91
--- SPECS/VMware-workstation.spec:1.90	Fri Apr 21 00:42:29 2006
+++ SPECS/VMware-workstation.spec	Sat Jun 24 17:01:39 2006
@@ -50,9 +50,9 @@
 NoSource:	0
 URL:		http://www.vmware.com/
 BuildRequires:	gcc-c++
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.7}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.308
 BuildRequires:	sed >= 4.0
 Requires:	kernel(vmmon) = %{version}-%{_rel}
 Requires:	libgnomecanvasmm
@@ -127,7 +127,7 @@
 %description samba -l pl
 Narzędzia VMware do SMB.
 
-%package -n kernel-misc-vmmon
+%package -n kernel%{_alt_kernel}-misc-vmmon
 Summary:	Kernel module for VMware Workstation
 Summary(pl):	Moduł jądra dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -140,13 +140,13 @@
 %endif
 Provides:	kernel(vmmon) = %{version}-%{_rel}
 
-%description -n kernel-misc-vmmon
+%description -n kernel%{_alt_kernel}-misc-vmmon
 Kernel modules for VMware Workstation - vmmon.
 
-%description -n kernel-misc-vmmon -l pl
+%description -n kernel%{_alt_kernel}-misc-vmmon -l pl
 Moduły jądra dla VMware Workstation - vmmon.
 
-%package -n kernel-misc-vmnet
+%package -n kernel%{_alt_kernel}-misc-vmnet
 Summary:	Kernel module for VMware Workstation
 Summary(pl):	Moduł jądra dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -159,13 +159,13 @@
 %endif
 Provides:	kernel(vmnet) = %{version}-%{_rel}
 
-%description -n kernel-misc-vmnet
+%description -n kernel%{_alt_kernel}-misc-vmnet
 Kernel modules for VMware Workstation - vmnet.
 
-%description -n kernel-misc-vmnet -l pl
+%description -n kernel%{_alt_kernel}-misc-vmnet -l pl
 Moduły jądra dla VMware Workstation - vmnet.
 
-%package -n kernel-smp-misc-vmmon
+%package -n kernel%{_alt_kernel}-smp-misc-vmmon
 Summary:	SMP kernel module for VMware Workstation
 Summary(pl):	Moduł jądra SMP dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -178,13 +178,13 @@
 %endif
 Provides:	kernel(vmmon) = %{version}-%{_rel}
 
-%description -n kernel-smp-misc-vmmon
+%description -n kernel%{_alt_kernel}-smp-misc-vmmon
 SMP kernel modules fov VMware Workstation - vmmon-smp.
 
-%description -n kernel-smp-misc-vmmon -l pl
+%description -n kernel%{_alt_kernel}-smp-misc-vmmon -l pl
 Moduły jądra SMP dla VMware Workstation - vmmon-smp.
 
-%package -n kernel-smp-misc-vmnet
+%package -n kernel%{_alt_kernel}-smp-misc-vmnet
 Summary:	SMP kernel module for VMware Workstation
 Summary(pl):	Moduł jądra SMP dla VMware Workstation
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -197,10 +197,10 @@
 %endif
 Provides:	kernel(vmnet) = %{version}-%{_rel}
 
-%description -n kernel-smp-misc-vmnet
+%description -n kernel%{_alt_kernel}-smp-misc-vmnet
 SMP kernel module for VMware Workstation - vmnet-smp.
 
-%description -n kernel-smp-misc-vmnet -l pl
+%description -n kernel%{_alt_kernel}-smp-misc-vmnet -l pl
 Moduły jądra SMP dla VMware Workstation - vmnet-smp.
 
 %package -n kernel24-misc-vmmon
@@ -493,28 +493,28 @@
 	/sbin/chkconfig --del vmnet
 fi
 
-%post	-n kernel-misc-vmmon
+%post	-n kernel%{_alt_kernel}-misc-vmmon
 %depmod %{_kernel_ver}
 
-%postun -n kernel-misc-vmmon
+%postun -n kernel%{_alt_kernel}-misc-vmmon
 %depmod %{_kernel_ver}
 
-%post	-n kernel-misc-vmnet
+%post	-n kernel%{_alt_kernel}-misc-vmnet
 %depmod %{_kernel_ver}
 
-%postun -n kernel-misc-vmnet
+%postun -n kernel%{_alt_kernel}-misc-vmnet
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-misc-vmmon
+%post	-n kernel%{_alt_kernel}-smp-misc-vmmon
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-misc-vmmon
+%postun -n kernel%{_alt_kernel}-smp-misc-vmmon
 %depmod %{_kernel_ver}smp
 
-%post	-n kernel-smp-misc-vmnet
+%post	-n kernel%{_alt_kernel}-smp-misc-vmnet
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-misc-vmnet
+%postun -n kernel%{_alt_kernel}-smp-misc-vmnet
 %depmod %{_kernel_ver}smp
 
 %post	-n kernel24-misc-vmmon
@@ -614,20 +614,20 @@
 
 %if %{with kernel}
 %if %{without kernel24}
-%files -n kernel-misc-vmmon
+%files -n kernel%{_alt_kernel}-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
 
-%files -n kernel-misc-vmnet
+%files -n kernel%{_alt_kernel}-misc-vmnet
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmnet.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files	-n kernel-smp-misc-vmmon
+%files	-n kernel%{_alt_kernel}-smp-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/vmmon.ko*
 
-%files	-n kernel-smp-misc-vmnet
+%files	-n kernel%{_alt_kernel}-smp-misc-vmnet
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/vmnet.ko*
 %endif
@@ -661,6 +661,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2006/06/24 15:01:39  sparky
+- alternative kernel support
+
 Revision 1.90  2006/04/20 22:42:29  adamg
 - fix %setup
 
@@ -728,7 +731,7 @@
 - vmware-any-any-update94
 
 Revision 1.69  2005/09/16 10:50:58  pluto
-- _urel 93, reentrant %%build.
+- _urel 93, reentrant %build.
 - fixed kernel capabilites (#define HVW_HAVE_xxx) autodetection.
   (kernel build system passes -Iinclude/asm-$arch/mach-* to vm_check_build
    so we need a simple symlink to fix this issue).
@@ -759,7 +762,7 @@
 - it works with internal libs now.
 
 Revision 1.60  2005/04/14 00:26:36  pluto
-- fixed -networking %%files.
+- fixed -networking %files.
 
 Revision 1.59  2005/04/14 00:17:37  pluto
 - this release doesn't contain samba stuff.
@@ -813,7 +816,7 @@
 - release 4.
 
 Revision 1.46  2004/10/17 10:35:52  pluto
-- _urel 84, %%build updated.
+- _urel 84, %build updated.
 - release 3.1.
 
 Revision 1.45  2004/10/01 16:50:40  jack
@@ -851,7 +854,7 @@
 - TODO: add icon
 
 Revision 1.35  2004/06/05 09:06:13  jack
--m mismatched packages release
+- m mismatched packages release
 
 Revision 1.34  2004/06/05 08:58:41  jack
 - updated vmware-any-any-update to 68 (builds on 2.6.7-0.12)
@@ -875,7 +878,7 @@
 - Require kernel-module-build (kernel-header is not enough)
 
 Revision 1.27  2004/04/17 08:58:23  krzak
-BuildRequires:      kernel-doc
+- BuildRequires:      kernel-doc
 
 Revision 1.26  2004/04/14 17:41:56  adgor
 - dev requirements moved to proper place
@@ -885,14 +888,14 @@
 
 Revision 1.24  2004/04/14 09:22:41  pluto
 - now it builds with 2.6.4/2.6.5.
-- %%files.
+- %files.
 - release 4.
 
 Revision 1.23  2004/04/13 16:48:23  pluto
 - urel 57.
 
 Revision 1.22  2004/04/13 16:14:24  pluto
-- %%dev moved to dev.spec.
+- %dev moved to dev.spec.
 
 Revision 1.21  2004/04/10 19:17:19  adgor
 - Builds with 2.6.5
@@ -992,7 +995,7 @@
 
 Revision 1.9.2.7  2004/03/13 00:25:31  pluto
 - kernel modules.
-- %%files.
+- %files.
 
 Revision 1.9.2.6  2004/03/12 19:07:35  pluto
 - release 0.2
@@ -1018,7 +1021,7 @@
 - added _with_i_know_its_nfy bcond
 
 Revision 1.8  2003/08/11 20:44:51  ankry
-cosmetics
+- cosmetics
 
 Revision 1.7  2003/07/10 12:42:16  trojan
 - added using depmod macro
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.90&r2=1.91&f=u

More information about the pld-cvs-commit mailing list