9:09 p.m.
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25915
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Removed Files:
filter-provides.sh filter-requires.sh nvidia-config-display
nvidia-init
Log Message:
Update to current
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore 30 Apr 2011 22:35:09 -0000 1.30
+++ .cvsignore 8 Jun 2011 21:09:17 -0000 1.31
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-270.41.06.run
-NVIDIA-Linux-x86_64-270.41.06.run
+NVIDIA-Linux-x86-270.41.19.run
+NVIDIA-Linux-x86_64-270.41.19.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 30 Apr 2011 22:35:09 -0000 1.30
+++ sources 8 Jun 2011 21:09:17 -0000 1.31
@@ -1,2 +1,2 @@
-702868c77b13bba46f0fce26ed7a1fb7 NVIDIA-Linux-x86-270.41.06.run
-76d94f513731c75bdc4b763a3501cd4e NVIDIA-Linux-x86_64-270.41.06.run
+c167e32702f56599bd600add97943312 NVIDIA-Linux-x86-270.41.19.run
+b84143ecb5c0511c5ef9e53e732d9136 NVIDIA-Linux-x86_64-270.41.19.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xorg-x11-drv-nvidia.spec 30 Apr 2011 22:35:09 -0000 1.60
+++ xorg-x11-drv-nvidia.spec 8 Jun 2011 21:09:17 -0000 1.61
@@ -1,15 +1,12 @@
%global nvidialibdir %{_libdir}/nvidia
%global ignoreabi 0
-# Tweak to have debuginfo - part 1/2
-%if 0%{?fedora} >= 7
-%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh
%{_builddir}/%{?buildsubdir}\
-%{nil}
-%endif
+%global debug_package %{nil}
+%global __strip /bin/true
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 270.41.06
+Version: 270.41.19
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -20,18 +17,9 @@
Source1:
ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source2: 00-nvidia.conf
Source3: nvidia-xorg.conf
-#Source5: nvidia-init
Source6: blacklist-nouveau.conf
-#Source10: nvidia-config-display
Source11: nvidia-README.Fedora
-# So we don't pull other nvidia variants
-Source91: filter-requires.sh
-# So we don't mess with mesa provides.
-Source92: filter-provides.sh
Source99: 00-ignoreabi.conf
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
-%define __find_provides %{SOURCE92}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -80,6 +68,20 @@
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
+%{?filter_setup:
+%filter_from_provides /^libnvidia/d;
+%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGL\.so/d;
+%filter_from_provides /^libvdpau_nvidia\.so\.1/d;
+%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_from_provides /^libglx\.so/d;
+%filter_from_requires /^libnvidia/d;
+%filter_from_requires /^libGLCore\.so/d;
+%filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libvdpau_nvidia\.so\.1/d;
+%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_setup
+}
%description
This package provides the most recent NVIDIA display driver which allows for
@@ -131,11 +133,6 @@
sh %{SOURCE0} --extract-only --target nvidiapkg-x86
sh %{SOURCE1} --extract-only --target nvidiapkg-x64
tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-# Tweak to have debuginfo - part 2/2
-%if 0%{?fedora} >= 7
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
%ifarch %{ix86}
ln -s nvidiapkg-x86 nvidiapkg
@@ -143,12 +140,6 @@
ln -s nvidiapkg-x64 nvidiapkg
%endif
-# Tweak to have debuginfo - part 2/2
-%if 0%{?fedora} >= 7
-cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
-sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
-%endif
-
%build
# Nothing to build
echo "Nothing to build"
@@ -350,6 +341,10 @@
%changelog
+* Wed Jun 08 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.19-1
+- Update to 270.41.19
+- Use official filter macros - patch from <Jochen herr-schmitt de>
+
* Sat Apr 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:270.41.06-1
- Update to 270.41.06
--- filter-provides.sh DELETED ---
--- filter-requires.sh DELETED ---
--- nvidia-config-display DELETED ---
--- nvidia-init DELETED ---