- updated kernel modules build system

[packages/xorg-driver-video-nvidia-legacy-304xx.git] / xorg-driver-video-nvidia-legacy-304xx.spec

diff --git a/xorg-driver-video-nvidia-legacy-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec
index 3a15a2537ba653c0f053066ec0b3ce97f4ed6376..bfa959a81b775e763f994ef057925143f07f9b80 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -4,16 +4,11 @@
 # - kernel-drm is required on newer kernels. driver for kernel-longterm not requires drm
 #
 # Conditional build:
-%bcond_without dist_kernel     # without distribution kernel
 %bcond_without kernel          # without kernel packages
 %bcond_without userspace       # don't build userspace programs
 %bcond_with    settings        # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec)
 %bcond_with    verbose         # verbose build (V=1)
 
-%if %{without kernel}
-%undefine      with_dist_kernel
-%endif
-
 # The goal here is to have main, userspace, package built once with
 # simple release number, and only rebuild kernel packages with kernel
 # version as part of release number, without the need to bump release
@@ -23,18 +18,6 @@
 exit 1
 %endif
 
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine      with_userspace
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine      with_userspace
-%global                _build_kernels          %{alt_kernel}
-%else
-%global                _build_kernels          %{?build_kernels:,%{?build_kernels}}
-%endif
-
 %if %{without userspace}
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
@@ -42,10 +25,6 @@ exit 1
 
 %define                no_install_post_check_so 1
 
-%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     1
 %define                mname   nvidia-legacy-304xx
 %define                pname   xorg-driver-video-%{mname}
@@ -69,8 +48,8 @@ Source5:      10-nvidia-modules.conf
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
 URL:           http://www.nvidia.com/object/unix.html
-BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_dist_kernel:%{expand:%kbrs}}
+BuildRequires: rpmbuild(macros) >= 1.701
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
@@ -203,13 +182,11 @@ Release:  %{rel}@%{_kernel_ver_str}\
 Group:         Base/Kernel\
 Requires(post,postun): /sbin/depmod\
 Requires:      dev >= 2.7.7-10\
-%if %{with dist_kernel}\
 %requires_releq_kernel\
 %if %{_kernel_version_code} >= %{_kernel_version_magic 3 10 0}\
 Requires:      %{releq_kernel -n drm}\
 %endif\
 Requires(postun):      %releq_kernel\
-%endif\
 Requires:      %{pname} = %{epoch}:%{version}\
 Provides:      X11-driver-nvidia(kernel)\
 Obsoletes:     XFree86-nvidia-kernel\
@@ -255,7 +232,7 @@ cd ..\
 %install_kernel_modules -D installed -m kernel/nvidia -d misc\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 cd %{_builddir}
@@ -271,7 +248,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %patch1 -p1
 
 %build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT