- added x32 to arch mix

[packages/lin_tape.git] / lin_tape.spec

diff --git a/lin_tape.spec b/lin_tape.spec
index 472eca64398f0210f58e04261211c72602eac6d8..fc3f1167d7bd6b0e7991e1989d3c4dc4c510d6a3 100644 (file)
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -1,26 +1,11 @@
 #
 # Conditional build:
-%bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_with    verbose         # verbose build (V=1)
 
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 
-%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                rel     0.1
+%define                rel     3
 %define                pname   lin_tape
 Summary:       IBM Tape SCSI Device Driver for Linux
 Name:          %{pname}%{_alt_kernel}
@@ -32,10 +17,11 @@ Source0:    %{pname}-%{version}.tgz
 # Source0-md5: 305d2922f942a73f0f0b30fa49b92dd5
 Patch0:                use-module-dir.patch
 Patch1:                linux-3.10.patch
+Patch2:                insecure-perms.patch
 # System Storage, Tape systems, Tape drivers and software, Tape device drivers (Linux)
 URL:           http://www.ibm.com/support/fixcentral/
-BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+BuildRequires: rpmbuild(macros) >= 1.701
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,10 +35,8 @@ Summary:     IBM Tape SCSI Device Driver for Linux\
 Release:       %{rel}@%{_kernel_ver_str}\
 Group:         Base/Kernel\
 Requires(post,postun): /sbin/depmod\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 Requires(postun):      %releq_kernel\
-%endif\
 \
 %description -n kernel%{_alt_kernel}-scsi-lin_tape\
 The IBM Tape Device Driver is a device driver that provides attachment\
@@ -76,16 +60,17 @@ compatible platforms.\
 %install_kernel_modules -D installed -m lin_tape -d kernel/drivers/scsi\
 %{nil}
 
-%{expand:%kpkg}
+%{expand:%create_kernel_packages}
 
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%ifarch %ix86 ia64
+%patch2 -p1
+%ifarch %{ix86} ia64
 proc="Intel"
 %endif
-%ifarch %x8664
+%ifarch %{x8664} x32
 proc="AMD"
 %endif
 %ifarch ppc ppc64 powerpc powerpc64
@@ -102,7 +87,7 @@ proc="zSeries"
 %{__cp} -af Makefile.GPL Makefile
 
 %build
-%{expand:%bkpkg}
+%{expand:%build_kernel_packages}
 
 %install
 rm -rf $RPM_BUILD_ROOT