[packages/open-vm-tools] - add -kernel suffix to (srpm) package name when building kernel modules on builders - autogenerate

baggins baggins at pld-linux.org
Mon Oct 28 14:02:45 CET 2013


commit 13e08991c6cc8e9002991003e4c6e0664d5e652c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Oct 28 14:02:05 2013 +0100

    - add -kernel suffix to (srpm) package name when building kernel modules on builders
    - autogenerate kernel BRs
    - rel 5

 open-vm-tools.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 07df564..d4577f3 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -29,6 +29,7 @@ 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)
 
@@ -36,15 +37,15 @@ exit 1
 %define		subver	%(echo %{snap} | tr -d .)
 %define		ver     9.4.0
 %define		rev     1280544
-%define		rel	4
+%define		rel	5
 %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
@@ -86,7 +87,7 @@ 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)
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/13e08991c6cc8e9002991003e4c6e0664d5e652c



More information about the pld-cvs-commit mailing list