Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19784/F-15
Modified Files:
.cvsignore nvidia-kmod.spec sources
Removed Files:
kernel-3.3.patch
nvidia-blacklist-register-mapping-256-285.diff
Log Message:
Back to lastest LT serie
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 3 Aug 2011 18:24:33 -0000 1.35
+++ .cvsignore 28 Jun 2012 12:05:11 -0000 1.36
@@ -1 +1 @@
-nvidia-kmod-data-280.13.tar.bz2
+nvidia-kmod-data-295.59.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- nvidia-kmod.spec 28 Jun 2012 06:56:46 -0000 1.134
+++ nvidia-kmod.spec 28 Jun 2012 12:05:11 -0000 1.135
@@ -7,9 +7,9 @@
Name: nvidia-kmod
Epoch: 1
-Version: 280.13
+Version: 295.59
# Taken over by kmodtool
-Release: 4%{?dist}.7
+Release: 1%{?dist}.1
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,15 +19,12 @@
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
# <switch me> when sources are on kwizart's repo
-Source0:
http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2
+Source0:
http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.xz
#Source0:
http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers...
# </switch me>
Source11: nvidia-kmodtool-excludekernel-filterfile
-Patch0: kernel-3.3.patch
-#http://nvidia.custhelp.com/app/answers/detail/a_id/3109
-Patch1: nvidia-blacklist-register-mapping-256-285.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,14 +47,6 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile
%{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}"
%{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"}
2>/dev/null
%setup -q -c -T -a 0
-# patch loop
-for arch in x86 x64
-do
-pushd nvidiapkg-${arch}
-%patch0 -p1
-%patch1 -p0
-popd
-done
for kernel_version in %{?kernel_versions} ; do
%ifarch %{ix86}
@@ -67,21 +56,11 @@
%endif
done
-
%build
for kernel_version in %{?kernel_versions}; do
- pushd _kmod_build_${kernel_version%%___*}/kernel/
- ln -s -f Makefile.kbuild Makefile
- if [[ "${kernel_version%%___*}" = *xen ]] ; then
- CC="cc -D__XEN_TOOLS__ \
- -I${kernel_version##*___}/include/asm/mach-xen" \
- IGNORE_XEN_PRESENCE=1 \
- make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
- else
- IGNORE_XEN_PRESENCE=1 \
- make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
- fi
- popd
+ pushd _kmod_build_${kernel_version%%___*}/kernel/
+ make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ popd
done
@@ -98,12 +77,21 @@
%changelog
-* Thu Jun 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:280.13-4.7
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.59-1.1
+- Rebuilt for updated kernel
+
+* Mon Jun 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.59-1
+- Update to 295.59
+
+* Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.53-1.2
- Rebuilt for updated kernel
-* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:280.13-4.6
+* Thu May 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.53-1.1
- Rebuilt for updated kernel
+* Tue May 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.53-1
+- Update to 295.53
+
* Wed May 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:280.13-4.5
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 26 Jun 2012 13:09:09 -0000 1.38
+++ sources 28 Jun 2012 12:05:11 -0000 1.39
@@ -1 +1 @@
-c5728cbe2d975fcfb2cde71303032db3 nvidia-kmod-data-280.13.tar.bz2
+4ff9b2a6e8f99357610cc020adcd9689 nvidia-kmod-data-295.59.tar.xz
--- kernel-3.3.patch DELETED ---
--- nvidia-blacklist-register-mapping-256-285.diff DELETED ---