From fe7c9b1297a5b6172cf0b6deae99ed32bb3cbbf2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 27 Jan 2015 20:06:13 +0100 Subject: [PATCH] - drop non-dist kernel support --- xorg-driver-video-nvidia.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index a9b2b17..7b39ce5 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -4,16 +4,11 @@ # - kernel-drm is required on never 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 @@ -69,7 +64,7 @@ Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch URL: http://www.nvidia.com/object/unix.html BuildRequires: rpmbuild(macros) >= 1.679 -%{?with_dist_kernel:%{expand:%kbrs}} +%{?with_kernel:%{expand:%kbrs}} BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} @@ -204,13 +199,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\ -- 2.43.0