X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xorg-driver-video-nvidia-legacy-304xx.spec;h=9e01aad2051b4b53bfa1a74dcbf14df54dbd9952;hb=b79b97c787ff6633bf1ffc091675258e27be32cb;hp=fa3c5109df0c221b576cb31112de1db922d7a7b9;hpb=8c8adc06f4fab9799b5099e3c52ea9a92dc66ffb;p=packages%2Fxorg-driver-video-nvidia-legacy-304xx.git

diff --git a/xorg-driver-video-nvidia-legacy-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec
index fa3c510..9e01aad 100644
--- 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,48 +25,36 @@ 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 8
+%define		rel	3
 %define		mname	nvidia-legacy-304xx
 %define		pname	xorg-driver-video-%{mname}
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-# when updating version here, keep nvidia-settings.spec in sync as well
-Version:	304.88
+Version:	304.123
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
 Source0:	http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5:	f60d4aef766029c98914ed665235029a
+# Source0-md5:	52307054483f5c40391608ce69114d48
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	35e0c7d30de795cccb6b95bda991fb77
+# Source1-md5:	9d461e9e00e473f458aee96cd6d85101
 Source2:	xinitrc.sh
 Source3:	gl.pc.in
 Source4:	10-nvidia.conf
 Source5:	10-nvidia-modules.conf
-Source6:	patches.h
-Source7:	conftest.h
-Source8:	conftest.sh
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
-Patch2:		linux-3.10-i2c.patch
-Patch3:		linux-3.10-procfs.patch
-Patch4:		linux-3.11.patch
-Patch5:		kbuild.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}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 14.1
+Requires:	xorg-xserver-server(videodrv-abi) <= 18.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:	xorg-driver-video
 Provides:	xorg-xserver-module(glx)
@@ -211,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\
@@ -263,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}
@@ -277,18 +246,9 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-install %{SOURCE6} kernel/
-install %{SOURCE7} kernel/
-install -m 755 %{SOURCE8} kernel/
-echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -380,12 +340,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 cat << 'EOF'
-NOTE: You must also install kernel module for this driver to work
-  kernel-%{mname}-%{version}
+NOTE: You must also install kernel module for this driver to work:
+  kernel%{_alt_kernel}-%{mname}-%{version}
 
 EOF
 
-%post libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %if %{with userspace}