packages: open-vm-tools/open-vm-tools.spec - rel 2 - make our builders/ftp ...

[baggins]

Author: baggins                      Date: Sat Apr  7 10:03:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- make our builders/ftp happy

---- Files affected:
packages/open-vm-tools:
   open-vm-tools.spec (1.138 -> 1.139) 

---- Diffs:

================================================================
Index: packages/open-vm-tools/open-vm-tools.spec
diff -u packages/open-vm-tools/open-vm-tools.spec:1.138 packages/open-vm-tools/open-vm-tools.spec:1.139
--- packages/open-vm-tools/open-vm-tools.spec:1.138	Fri Apr  6 22:21:18 2012
+++ packages/open-vm-tools/open-vm-tools.spec	Sat Apr  7 12:02:55 2012
@@ -9,26 +9,27 @@
 %define		subver	%(echo %{snap} | tr -d .)
 %define		ver     8.8.2
 %define		rev     590212
-%define		rel    	1
+%define		rel    	2
+%define		pname	open-vm-tools
 %define     modsrc	modules/linux
 Summary:	VMWare guest utilities
 Summary(pl.UTF-8):	Narzędzia dla systemu-gościa dla VMware
-Name:		open-vm-tools
+Name:		%{pname}%{_alt_kernel}
 Version:	%{ver}
 #Release:	0.%{subver}.%{rel}
 Release:	%{rel}
 Epoch:		1
 License:	GPL
 Group:		Applications/System
-Source0:	http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-8.8.x/%{name}-%{ver}-%{rev}.tar.gz
+Source0:	http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-8.8.x/%{pname}-%{ver}-%{rev}.tar.gz
 # Source0-md5:	601b97d54b72a601af102535a85026de
-#Source0:	http://downloads.sourceforge.net/open-vm-tools/open-vm-tools/%{snap}/%{name}-%{snap}-%{rev}.tar.gz
-Source1:	%{name}-packaging
-Source2:	%{name}-modprobe.d
-Source3:	%{name}-init
-Source4:	%{name}-vmware-user.desktop
-Patch0:		%{name}-kernel-3.2.patch
-Patch1:		%{name}-kernel-3.3.patch
+#Source0:	http://downloads.sourceforge.net/open-vm-tools/open-vm-tools/%{snap}/%{pname}-%{snap}-%{rev}.tar.gz
+Source1:	%{pname}-packaging
+Source2:	%{pname}-modprobe.d
+Source3:	%{pname}-init
+Source4:	%{pname}-vmware-user.desktop
+Patch0:		%{pname}-kernel-3.2.patch
+Patch1:		%{pname}-kernel-3.3.patch
 URL:		http://open-vm-tools.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with userspace}
@@ -63,7 +64,7 @@
 BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.33
 %endif
 ExclusiveArch:	%{ix86} %{x8664}
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
 # constify %rel macro, so it wouldn't expand in kernel subpkgs
 %{expand:%%global rel %{release}}
@@ -78,7 +79,7 @@
 Summary:	Header files for open-vm-tools
 Summary(pl.UTF-8):	Pliki nagłówkowe open-vm-tools
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{pname} = %{epoch}:%{version}-%{release}
 
 %description devel
 Header files for open-vm-tools.
@@ -90,7 +91,7 @@
 Summary:	Static open-vm-tools libraries
 Summary(pl.UTF-8):	Statyczne biblioteki open-vm-tools
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:	%{pname}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static open-vm-tools libraries.
@@ -102,7 +103,7 @@
 Summary:	VMware guest utitities
 Summary(pl.UTF-8):	Narzędzia dla systemu-gościa dla VMware.
 Group:		Applications/System
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{pname} = %{epoch}:%{version}-%{release}
 
 %description gui
 VMWare guest utilities. This package contains GUI part of tools.
@@ -220,8 +221,8 @@
 Moduł jądra Linuksa VMware vsock.
 
 %prep
-#setup -q -n %{name}-%{snap}-%{rev}
-%setup -q -n %{name}-%{ver}-%{rev}
+#setup -q -n %{pname}-%{snap}-%{rev}
+%setup -q -n %{pname}-%{ver}-%{rev}
 %patch0 -p1
 %patch1 -p1
 
@@ -269,8 +270,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/open-vm-tools/plugins/common/*.la
 
 install -d $RPM_BUILD_ROOT/etc/{modprobe.d,rc.d/init.d,xdg/autostart}
-cp %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/%{name}.conf
-cp %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/%{pname}.conf
+cp %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{pname}
 cp %{SOURCE4} $RPM_BUILD_ROOT/etc/xdg/autostart/vmware-user.desktop
 %endif
 
@@ -353,8 +354,8 @@
 %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libresolutionSet.so
 %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libunity.so
 %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libvixUser.so
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-/etc/modprobe.d/%{name}.conf
+%attr(754,root,root) /etc/rc.d/init.d/%{pname}
+/etc/modprobe.d/%{pname}.conf
 %lang(de) %{_datadir}/open-vm-tools/messages/de/toolbox.vmsg
 %lang(ja) %{_datadir}/open-vm-tools/messages/ja/toolbox.vmsg
 %lang(zh_CN) %{_datadir}/open-vm-tools/messages/zh_CN/toolbox.vmsg
@@ -417,6 +418,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139  2012/04/07 10:02:55  baggins
+- rel 2
+- make our builders/ftp happy
+
 Revision 1.138  2012/04/06 20:21:18  baggins
 - ifdef ethtools methods removed in linux 3.3 from vmxnet
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/open-vm-tools/open-vm-tools.spec?r1=1.138&r2=1.139