Author: charles Date: Sat Aug 20 00:06:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - rpmbuild(macros) >= 1.217 - added kernel, userspace, verbose bconds
---- Files affected: SPECS: VMware-workstation.spec (1.65 -> 1.66) ---- Diffs: ================================================================ Index: SPECS/VMware-workstation.spec diff -u SPECS/VMware-workstation.spec:1.65 SPECS/VMware-workstation.spec:1.66 --- SPECS/VMware-workstation.spec:1.65 Sun Jun 5 22:22:48 2005 +++ SPECS/VMware-workstation.spec Sat Aug 20 02:06:15 2005 @@ -5,9 +5,12 @@ # - http://www.vmware.com/support/ws45/doc/devices_linux_kb_ws.html#1040861 # # Conditional build: -%bcond_with internal_libs # internal libs stuff %bcond_without dist_kernel # without distribution kernel +%bcond_without kernel # don't build kernel modules %bcond_without smp # without SMP kernel modules +%bcond_without userspace # don't build userspace utilities +%bcond_with internal_libs # internal libs stuff +%bcond_with verbose # verbose build (V=1) # %include /usr/lib/rpm/macros.perl # @@ -39,11 +42,11 @@ NoSource: 0 URL: http://www.vmware.com/ BuildRequires: gcc-c++ -Requires: kernel(vmmon) = %{version}-%{_rel} %{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7} BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) >= 1.153 +BuildRequires: rpmbuild(macros) >= 1.217 BuildRequires: sed >= 4.0 +Requires: kernel(vmmon) = %{version}-%{_rel} Requires: libgnomecanvasmm ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -214,6 +217,7 @@ ./update bridge ../bin/vmnet-bridge %endif +%if %{with kernel} rm -rf built mkdir built cp -a vmmon-only vmmon-only.clean @@ -234,15 +238,19 @@ %{__make} -C %{_kernelsrcdir} modules \ VMWARE_VER=VME_V5 \ M=$PWD O=$PWD \ - VM_KBUILD=26 + VM_KBUILD=26 \ + %{?with_verbose:V=1} mv -f $mod.ko ../built/$mod-$cfg.ko cd - done done cd .. +%endif %install rm -rf $RPM_BUILD_ROOT + +%if %{with userspace} install -d \ $RPM_BUILD_ROOT%{_sysconfdir}/vmware \ $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/{nat,dhcpd} \ @@ -252,8 +260,11 @@ $RPM_BUILD_ROOT%{_pixmapsdir} \ $RPM_BUILD_ROOT%{_desktopdir} \ $RPM_BUILD_ROOT/etc/rc.d/init.d \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc \ $RPM_BUILD_ROOT/var/run/vmware +%endif + +%if %{with kernel} +install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc cd vmware-any-any-update%{_urel} install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ @@ -267,7 +278,9 @@ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.ko %endif cd - +%endif +%if %{with userspace} install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vmnet install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet.conf install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir} @@ -300,6 +313,7 @@ %else install lib/bin/vmware $RPM_BUILD_ROOT%{_bindir} %endif +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -344,6 +358,7 @@ %postun -n kernel-smp-misc-vmnet %depmod %{_kernel_ver}smp +%if %{with userspace} %files %defattr(644,root,root,755) %doc doc/* lib/configurator/vmnet-{dhcpd,nat}.conf @@ -410,7 +425,9 @@ %attr(755,root,root) %{_bindir}/vmware-smbpasswd.bin %{_libdir}/vmware/smb %endif +%endif +%if %{with kernel} %files -n kernel-misc-vmmon %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmmon.ko* @@ -428,6 +445,7 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}smp/misc/vmnet.ko* %endif +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -435,6 +453,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.66 2005/08/20 00:06:15 charles +- rpmbuild(macros) >= 1.217 +- added kernel, userspace, verbose bconds + Revision 1.65 2005/06/05 20:22:48 pawcioos - added missing R: libgnomecanvasmm ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.65&r2=1.66&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
