- updated to 304.123

[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 fa3c5109df0c221b576cb31112de1db922d7a7b9..3a15a2537ba653c0f053066ec0b3ce97f4ed6376 100644 (file)
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -46,36 +46,28 @@ exit 1
 %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     1
 %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}}
@@ -83,7 +75,7 @@ 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)
@@ -277,15 +269,6 @@ 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}}
@@ -380,12 +363,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}