- fix package naming

[packages/wl.git] / wl.spec

diff --git a/wl.spec b/wl.spec
index 2de5f79a49ec53a892acb880617f76753d1b4f8e..cfe637bfb91b5945378a7f1ca71ec805cf378f6b 100644 (file)
--- a/wl.spec
+++ b/wl.spec
@@ -2,7 +2,12 @@
 %bcond_without kernel          # don't build kernel modules
 %bcond_with    verbose         # verbose build (V=1)
 %bcond_without userspace       # don't build userspace programs
-%bcond_with    dkms            # build dkms package
+%bcond_without dkms            # build dkms package
+
+%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
+exit 1
+%endif
 
 %if %{without userspace}
 %undefine      with_dkms
@@ -11,11 +16,11 @@
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
-%define                rel     4
+%define                rel     8
 %define                pname   wl
 %define                file_ver        %(echo %{version} | tr . _)
 Summary:       Broadcom 802.11 a/b/g/n hybrid Linux networking device driver
-Name:          %{pname}%{_alt_kernel}
+Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:       6.30.223.248
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       other
@@ -32,7 +37,7 @@ Patch1:               gcc-4.9.patch
 URL:           http://www.broadcom.com/support/802.11/linux_sta.php
 BuildRequires: rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
-ExclusiveArch: %{ix86} %{x8664}
+ExclusiveArch: %{ix86} %{x8664} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -101,7 +106,7 @@ EOF\
 %{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 %define src 1
 %else
 %define src 0