SPECS: open-vm-tools.spec - use %cc_version; adapter

[glen]

Author: glen                         Date: Fri Jan 16 11:53:38 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %cc_version; adapter

---- Files affected:
SPECS:
   open-vm-tools.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/open-vm-tools.spec
diff -u SPECS/open-vm-tools.spec:1.7 SPECS/open-vm-tools.spec:1.8
--- SPECS/open-vm-tools.spec:1.7	Fri Jan 16 12:21:28 2009
+++ SPECS/open-vm-tools.spec	Fri Jan 16 12:53:32 2009
@@ -9,8 +9,6 @@
 %define		rev	137496
 %define		modsrc	modules/linux
 %define		rel	0.2
-%{expand:%%global	ccver	%(%{__cc} -dumpversion)}
-
 Summary:	VMWare guest utilities
 Summary(pl.UTF-8):	Narzędzia dla systemu-gościa dla VMware
 Name:		open-vm-tools
@@ -25,6 +23,7 @@
 Source3:	%{name}-init
 Source4:	%{name}-vmware-user.desktop
 URL:		http://open-vm-tools.sourceforge.net/
+BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with userspace}
 BuildRequires:	gtk+-devel
 BuildRequires:	libdnet-devel
@@ -32,10 +31,10 @@
 BuildRequires:	pkgconfig
 BuildRequires:	uriparser-devel
 BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXScrnSaver-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXtst-devel
-BuildRequires:	xorg-lib-libXScrnSaver-devel
 Requires:	ethtool
 %endif
 %if %{with kernel} && %{with dist_kernel}
@@ -51,7 +50,7 @@
 Narzędzia dla systemu-gościa dla VMware.
 
 %package gui
-Summary:	VMware guest utitities.
+Summary:	VMware guest utitities
 Summary(pl.UTF-8):	Narzędzia dla systemu-gościa dla VMware.
 Group:		Applications/System
 Requires:	%{name} = %{epoch}:%{version}-%{release}
@@ -60,8 +59,8 @@
 VMWare guest utilities. This package contains GUI part of tools.
 
 %description gui -l pl.UTF-8
-Narzędzia dla systemu-gościa dla VMware. Ten pakiet zawiera
-graficzną część narzędzi.
+Narzędzia dla systemu-gościa dla VMware. Ten pakiet zawiera graficzną
+część narzędzi.
 
 %package -n kernel%{_alt_kernel}-misc-pvscsi
 Summary:	VMware pvscsi Linux kernel module
@@ -231,15 +230,15 @@
 
 %build
 %if %{with kernel}
-%build_kernel_modules -C %{modsrc}/pvscsi	-m pvscsi	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vmblock	-m vmblock	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vmci		-m vmci		SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vmhgfs	-m vmhgfs	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vmmemctl	-m vmmemctl	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vmsync	-m vmsync	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vmxnet	-m vmxnet	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vmxnet3	-m vmxnet3	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
-%build_kernel_modules -C %{modsrc}/vsock	-m vsock	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{ccver}
+%build_kernel_modules -C %{modsrc}/pvscsi	-m pvscsi	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vmblock	-m vmblock	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vmci		-m vmci		SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vmhgfs	-m vmhgfs	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vmmemctl	-m vmmemctl	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vmsync	-m vmsync	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vmxnet	-m vmxnet	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vmxnet3	-m vmxnet3	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
+%build_kernel_modules -C %{modsrc}/vsock	-m vsock	SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version}
 %endif
 
 %if %{with userspace}
@@ -336,7 +335,7 @@
 %attr(755,root,root) %{_sbindir}/mount.vmhgfs
 %attr(755,root,root) %{_sbindir}/vmware-guestd
 %attr(755,root,root) %{_libdir}/lib*.so*
-%attr(755,root,root) /etc/rc.d/init.d/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
 /etc/modprobe.d/%{name}.conf
 
 %files gui
@@ -392,6 +391,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/01/16 11:53:32  glen
+- use %cc_version; adapter
+
 Revision 1.7  2009/01/16 11:21:28  pascalek
 - Release 0.2, init script, gui package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/open-vm-tools.spec?r1=1.7&r2=1.8&f=u