SPECS: VMware-server.spec - start 2.0 (build 63231), old one in VM...

glen glen at pld-linux.org
Tue Mar 4 23:06:37 CET 2008 

Author: glen                         Date: Tue Mar  4 22:06:37 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- start 2.0 (build 63231), old one in VMware-1_0 branch

---- Files affected:
SPECS:
   VMware-server.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.31 SPECS/VMware-server.spec:1.32
--- SPECS/VMware-server.spec:1.31	Sun Feb 10 23:37:31 2008
+++ SPECS/VMware-server.spec	Tue Mar  4 23:06:32 2008
@@ -28,47 +28,54 @@
 #
 %include	/usr/lib/rpm/macros.perl
 #
-%define		_ver	1.0.4
-%define		_build	56528
-%define		_rel	0.2
-%define		_urel	115
-%define		_ccver	%(rpm -q --qf "%{VERSION}" gcc)
+%define		ver	2.0
+%define		subver	63231
+%define		rel	0.1
+%define		urel	115
+%define		ccver	%(rpm -q --qf %{V} gcc)
 #
 Summary:	VMware Server
 Summary(pl.UTF-8):	VMware Server - wirtualna platforma dla stacji roboczej
 Name:		VMware-server
-Version:	%{_ver}.%{_build}
-Release:	%{_rel}
+Version:	%{ver}.%{subver}
+Release:	%{rel}
 License:	custom, non-distributable
 Group:		Applications/Emulators
-Source0:	http://download3.vmware.com/software/vmserver/%{name}-%{_ver}-%{_build}.tar.gz
-# NoSource0-md5:	60ec55cd66b77fb202d88bee79baebdf
-Source1:	http://download3.vmware.com/software/vmserver/VMware-mui-%{_ver}-%{_build}.tar.gz
-# NoSource1-md5:	6b13063d8ea83c2280549d33da92c476
-Source2:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# NoSource2-md5:	ab33ff7a799fee77f0f4ba5667cd4b9a
-Source3:	%{name}.init
-Source4:	%{name}-vmnet.conf
-Source5:	%{name}.png
-Source6:	%{name}.desktop
-Source7:	%{name}-nat.conf
-Source8:	%{name}-dhcpd.conf
+# http://www.vmware.com/beta/server/download.html
+Source0:	http://download3.vmware.com/software/vmserver/%{name}-e.x.p-%{subver}.i386.tar.gz
+# NoSource0-md5:	853247ff0e313f34bd0c3052de8e2c28
+Source1:	http://download3.vmware.com/software/vmserver/%{name}-e.x.p-%{subver}.x86_64.tar.gz
+# NoSource1-md5:	0d36ae02640d913251fd11918f798da3
+Source2:	http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver}.i386.tar.gz
+# NoSource2-md5:	c7d162fb8c805143ea5b40e7f62ef4da
+Source3:	http://download3.vmware.com/software/vmserver/VMware-vix-e.x.p-%{subver}.x86_64.tar.gz
+# NoSource3-md5:	10124d4747e7a579a270376458b7a77b
+Source4:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{urel}.tar.gz
+# NoSource4-md5:	ab33ff7a799fee77f0f4ba5667cd4b9a
+Source5:	%{name}.init
+Source6:	%{name}-vmnet.conf
+Source7:	%{name}.png
+Source8:	%{name}.desktop
+Source9:	%{name}-nat.conf
+Source10:	%{name}-dhcpd.conf
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-run_script.patch
 Patch2:		%{name}-init_pl.patch
 NoSource:	0
 NoSource:	1
 NoSource:	2
+NoSource:	3
+NoSource:	4
 URL:		http://www.vmware.com/
-BuildRequires:	gcc-c++
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.20.2}
+BuildRequires:	libstdc++-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	sed >= 4.0
 Requires:	libgnomecanvasmm
 Requires:	libsexy
 Requires:	libsexymm
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautoprovfiles %{_libdir}/vmware*/lib/.*\.so.*
@@ -164,7 +171,7 @@
 %package -n kernel-misc-vmmon
 Summary:	Kernel module for VMware Server
 Summary(pl.UTF-8):	Moduł jądra dla VMware Server
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -172,7 +179,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
-Provides:	kernel(vmmon) = %{version}-%{_rel}
+Provides:	kernel(vmmon) = %{version}-%{rel}
 
 %description -n kernel-misc-vmmon
 Kernel modules for VMware Server - vmmon.
@@ -183,7 +190,7 @@
 %package -n kernel-misc-vmnet
 Summary:	Kernel module for VMware Server
 Summary(pl.UTF-8):	Moduł jądra dla VMware Server
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -191,7 +198,7 @@
 %requires_releq_kernel
 Requires(postun):	%releq_kernel
 %endif
-Provides:	kernel(vmnet) = %{version}-%{_rel}
+Provides:	kernel(vmnet) = %{version}-%{rel}
 
 %description -n kernel-misc-vmnet
 Kernel modules for VMware Server - vmnet.
@@ -201,8 +208,8 @@
 
 %prep
 %setup -q -n vmware-server-distrib -a1 -a2
-tar zxf vmware-mui-distrib/console-distrib/%{name}-console-%{_ver}-%{_build}.tar.gz
-cp vmware-any-any-update%{_urel}/{vmmon,vmnet}.tar lib/modules/source/
+tar zxf vmware-mui-distrib/console-distrib/%{name}-console-%{ver}-%{subver}.tar.gz
+cp vmware-any-any-update%{urel}/{vmmon,vmnet}.tar lib/modules/source/
 cd lib/modules/source
 tar xf vmmon.tar
 tar xf vmnet.tar
@@ -217,7 +224,7 @@
 %build
 sed -i 's:vm_db_answer_LIBDIR:VM_LIBDIR:g;s:vm_db_answer_BINDIR:VM_BINDIR:g' bin/vmware
 
-cd vmware-any-any-update%{_urel}
+cd vmware-any-any-update%{urel}
 chmod u+w ../lib/bin/vmware-vmx ../lib/bin-debug/vmware-vmx ../bin/vmnet-bridge
 
 %if 0
@@ -280,7 +287,7 @@
 			M=$PWD O=$PWD/o \
 			VM_KBUILD=26 \
 			%{?with_verbose:V=1} \
-			VM_CCVER=%{_ccver}
+			VM_CCVER=%{ccver}
 		mv -f $mod.ko ../built/$mod-$cfg.ko
 		cd -
 	done
@@ -322,7 +329,7 @@
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
-#cd vmware-any-any-update%{_urel}
+#cd vmware-any-any-update%{urel}
 cd lib/modules/source
 
 install built/vmmon-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \
@@ -334,12 +341,12 @@
 %endif
 
 %if %{with userspace}
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vmnet
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet.conf
-install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/nat/nat.conf
-install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.conf
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vmnet
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet.conf
+install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/nat/nat.conf
+install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.conf
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases
 touch $RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases~
@@ -530,112 +537,6 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.31  2008-02-10 22:37:31  wolvverine
-- add lost :
+Revision 1.32  2008-03-04 22:06:32  glen
+- start 2.0 (build 63231), old one in VMware-1_0 branch
 
-Revision 1.30  2008-02-10 22:36:18  wolvverine
-- rel.0.2
-
-Revision 1.29  2008-02-10 22:34:12  wolvverine
-- add lost %dir, TODO, R:libsexy/libsexymm
-
-Revision 1.28  2008-02-08 16:24:21  wolvverine
-- up to 1.0.4 build 56528
-
-Revision 1.27  2007-08-20 17:38:46  shadzik
-- Th deps:
-+ remove whole smp stuff
-+ remove kernel24 support
-+ proper macros
-+ s/up/dist/ changes
-- build fine on current Th
-
-Revision 1.26  2007/05/19 21:49:46  arekm
-- 1.0.3
-
-Revision 1.25  2007/04/25 10:01:36  hawk
-- updated to 1.0.2 build 39867, updated any-any update to 109, build
-  using kernel module sources from any-any update, not tested, probably
-  still doesn't work
-
-Revision 1.24  2007/03/14 00:13:57  glen
-- up bcond
-
-Revision 1.23  2007/02/12 21:23:45  glen
-- tabs in preamble
-
-Revision 1.22  2007/02/12 00:48:34  baggins
-- converted to UTF-8
-
-Revision 1.21  2006/11/13 14:51:45  sparky
-- don't use %{without ...}, it may not work after inverting bcond
-
-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)
-
-Revision 1.18  2006/09/06 13:48:33  sparky
-- mass atack: -j1 for make scripts
-
-Revision 1.17  2006/08/23 12:42:25  matipl
- - removed source-md5
-
-Revision 1.16  2006/08/23 12:40:21  matipl
- - updated source
-
-Revision 1.15  2006/08/14 13:56:54  czarny
- - up to 1.0.0 build 28343
- - rel 1.0.0.28343
-
-Revision 1.14  2006/06/20 12:56:53  hawk
-- include more required perl modules in package
-- create init.pl at build time, it seems to be required by serverd
-- still doesn't work but we are one step closer
-
-Revision 1.13  2006/06/19 15:50:46  hawk
-- blah, reverted some s/vmware/vmware-server/, now at least console works
-- added required /var/log/vmware, serverd still doesn't work
-
-Revision 1.12  2006/06/18 13:51:41  hawk
-- s/vmware-console/vmware-server-console/ where needed,
-  now it builds, not tested
-
-Revision 1.11  2006/06/18 12:12:40  hawk
-- tarball name has changed
-
-Revision 1.10  2006/06/18 12:01:33  hawk
-- updated to build 23869
-
-Revision 1.9  2006/05/09 18:34:57  qboosh
-- more NoSource tags
-
-Revision 1.8  2006/05/01 23:43:49  tommat
-- packaged perl files and missing pixmaps
-- rel 0.3
-
-Revision 1.7  2006/04/30 09:20:37  tommat
-- packaged console menu pixmaps
-- rel 0.2
-
-Revision 1.6  2006/04/30 08:39:13  tommat
-- build 22874
-- any-any-update 101
-- rel 0.1
-- new kernel module build way taken from VMware-workstation
-
-Revision 1.5  2006/04/20 17:56:49  glen
-- fix chkconfig deps
-
-Revision 1.4  2006/04/12 12:01:10  glen
-- kernel epoch, missing defattr
-
-Revision 1.3  2006/03/20 12:53:56  qboosh
-- updated any-any md5
-
-Revision 1.2  2006/03/19 17:50:57  glen
-- use %service
-
-Revision 1.1  2006/03/01 21:53:07  malekith
-- initial; doesn't work
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VMware-server.spec?r1=1.31&r2=1.32&f=u

More information about the pld-cvs-commit mailing list