- release 3 (by relup.sh)

[packages/open-vm-tools.git] / open-vm-tools.spec

diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index cb8c6bf40709fbbe40b4a8096ff7151874f0e27d..b7a6dbfa48f377335217588e1168bd573cdd282b 100644 (file)
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -29,33 +29,38 @@ exit 1
 %global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
 %endif
 
+%define                kbrs    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2" ; done)
 %define                kpkg    %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done)
 %define                bkpkg   %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done)
 
 %define                snap    2011.10.26
 %define                subver  %(echo %{snap} | tr -d .)
-%define                ver     9.4.0
-%define                rev     1280544
+%define                ver     9.4.6
+%define                rev     1770165
 %define                rel     3
 %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:          %{pname}%{_alt_kernel}
+Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:       %{ver}
 #Release:      0.%{subver}.%{rel}%{?with_kernel:@%{_kernel_ver_str}}
-Release:       %{rel}%{?with_kernel:@%{_kernel_ver_str}}
+Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:         1
 License:       GPL
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-9.4.x/%{pname}-%{ver}-%{rev}.tar.gz
-# Source0-md5: 91f74bf6e42a3f460a42b3be31db31dc
+# Source0-md5: 3969daf1535d34e1c5f0c87a779b7642
 #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}-linux-3.10.patch
+Patch2:                %{pname}-linux-3.12.patch
+Patch3:                %{pname}-linux-3.14.patch
+Patch4:                %{pname}-linux-3.15.patch
+Patch5:                %{pname}-linux-3.16.patch
 URL:           http://open-vm-tools.sourceforge.net/
 BuildRequires: rpmbuild(macros) >= 1.679
 %if %{with userspace}
@@ -86,13 +91,10 @@ Requires:   libicu
 Obsoletes:     kernel-misc-pvscsi
 Obsoletes:     kernel-misc-vmmemctl
 %endif
-%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+%{?with_dist_kernel:%{expand:%kbrs}}
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
-# constify %rel macro, so it wouldn't expand in kernel subpkgs
-%{expand:%%global rel %{release}}
-
 %description
 VMWare guest utilities.
 
@@ -317,6 +319,10 @@ export OVT_SOURCE_DIR=$PWD\
 %setup -q -n %{pname}-%{ver}-%{rev}
 %if %{with kernel}
 %patch0 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 %endif
 
 cp %{SOURCE1} packaging
@@ -327,6 +333,10 @@ cp %{SOURCE1} packaging
 
 %if %{with userspace}
 rm -rf autom4te.cache
+install -d config
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__automake}
 %{__autoconf}
 export CUSTOM_PROCPS_NAME=procps
 %configure2_13 \