packages: open-vm-tools/open-vm-tools.spec - back to %{rel} macro (this tim...

[glen]

Author: glen                         Date: Tue Nov 29 11:45:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- back to %{rel} macro (this time constant value)

---- Files affected:
packages/open-vm-tools:
   open-vm-tools.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: packages/open-vm-tools/open-vm-tools.spec
diff -u packages/open-vm-tools/open-vm-tools.spec:1.113 packages/open-vm-tools/open-vm-tools.spec:1.114
--- packages/open-vm-tools/open-vm-tools.spec:1.113	Tue Nov 29 10:22:16 2011
+++ packages/open-vm-tools/open-vm-tools.spec	Tue Nov 29 12:45:32 2011
@@ -6,16 +6,16 @@
 %bcond_without	userspace	# without userspace package
 
 %define		snap    2011.10.26
-%define		fsnap	%(echo %{snap} | tr -d .)
+%define		subver	%(echo %{snap} | tr -d .)
 %define		ver     8.4.2
 %define		rev     514583
-%define		rel    	6
+%define		rel    	7
 %define     modsrc	modules/linux
 Summary:	VMWare guest utilities
 Summary(pl.UTF-8):	Narzędzia dla systemu-gościa dla VMware
 Name:		open-vm-tools
 Version:	%{ver}
-Release:	0.%{fsnap}.%{rel}
+Release:	0.%{subver}.%{rel}
 Epoch:		1
 License:	GPL
 Group:		Applications/System
@@ -62,6 +62,9 @@
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# constify %rel macro, so it wouldn't expand in kernel subpkgs
+%{expand:%%global rel %{release}}
+
 %description
 VMWare guest utilities.
 
@@ -108,7 +111,7 @@
 %package -n kernel%{_alt_kernel}-misc-vmblock
 Summary:	VMware vmblock Linux kernel module
 Summary(pl.UTF-8):	Moduł jądra Linuksa VMware vmblock
-Release:	%{release}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -126,7 +129,7 @@
 %package -n kernel%{_alt_kernel}-misc-vmci
 Summary:	VMware vmci Linux kernel module
 Summary(pl.UTF-8):	Moduł jądra Linuksa VMware vmci
-Release:	%{release}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -144,7 +147,7 @@
 %package -n kernel%{_alt_kernel}-misc-vmhgfs
 Summary:	VMware vmhgfs Linux kernel module
 Summary(pl.UTF-8):	Moduł jądra Linuksa VMware vmhgfs
-Release:	%{release}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -162,7 +165,7 @@
 %package -n kernel%{_alt_kernel}-misc-vmsync
 Summary:	VMware vmsync Linux kernel module
 Summary(pl.UTF-8):	Moduł jądra Linuksa VMware vmsync
-Release:	%{release}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -180,7 +183,7 @@
 %package -n kernel%{_alt_kernel}-misc-vmxnet
 Summary:	VMware vmxnet Linux kernel module
 Summary(pl.UTF-8):	Moduł jądra Linuksa VMware vmxnet
-Release:	%{release}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -198,7 +201,7 @@
 %package -n kernel%{_alt_kernel}-misc-vsock
 Summary:	VMware vsock Linux kernel module
 Summary(pl.UTF-8):	Moduł jądra Linuksa VMware vsock
-Release:	%{release}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.9.0-7
@@ -401,6 +404,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2011/11/29 11:45:32  glen
+- back to %{rel} macro (this time constant value)
+
 Revision 1.113  2011/11/29 09:22:16  arekm
 - release 6
 
================================================================

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