rpms/xorg-x11-drv-nvidia-173xx/F-16 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xorg-x11-drv-nvidia-173xx.spec, 1.21, 1.22

Leigh Scott leigh123linux at rpmfusion.org
Sat May 19 19:54:24 CEST 2012 

Author: leigh123linux

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14273

Modified Files:
	.cvsignore sources xorg-x11-drv-nvidia-173xx.spec 
Log Message:
* Sat May 19 2012 leigh scott <leigh123linux at googlemail.com> - 173.14.34-1
- Update to 173.14.34



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-16/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Apr 2011 23:06:47 -0000	1.8
+++ .cvsignore	19 May 2012 17:54:23 -0000	1.9
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-173.14.30-pkg0.run
-NVIDIA-Linux-x86_64-173.14.30-pkg0.run
+NVIDIA-Linux-x86-173.14.34-pkg0.run
+NVIDIA-Linux-x86_64-173.14.34-pkg0.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-16/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Apr 2011 23:06:47 -0000	1.8
+++ sources	19 May 2012 17:54:23 -0000	1.9
@@ -1,2 +1,2 @@
-665f9f730c18ab24a997e0e14b863262  NVIDIA-Linux-x86-173.14.30-pkg0.run
-8c47463ae14a2f742d0fa00160456745  NVIDIA-Linux-x86_64-173.14.30-pkg0.run
+d6a69dd9fb74ee62ba209f60ad6ade5f  NVIDIA-Linux-x86-173.14.34-pkg0.run
+22ff628a1057d644c7c626aa38cd6bcc  NVIDIA-Linux-x86_64-173.14.34-pkg0.run


Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-16/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-nvidia-173xx.spec	30 Apr 2011 23:06:47 -0000	1.21
+++ xorg-x11-drv-nvidia-173xx.spec	19 May 2012 17:54:23 -0000	1.22
@@ -1,13 +1,10 @@
-%define        nvidialibdir      %{_libdir}/nvidia
+%global        nvidialibdir      %{_libdir}/nvidia
 
-# 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-173xx
-Version:       173.14.30
+Version:       173.14.34
 Release:       1%{?dist}
 Summary:       NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
 
@@ -16,19 +13,10 @@
 URL:           http://www.nvidia.com/
 Source0:       ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
 Source1:       ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-Source2:         00-nvidia.conf
-Source3:         nvidia-173xx-xorg.conf
-#Source5:       nvidia-173xx-init
+Source2:       00-nvidia.conf
+Source3:       nvidia-173xx-xorg.conf
 Source6:       blacklist-nouveau.conf
-Source10:      nvidia-173xx-config-display
 Source11:      nvidia-173xx-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
-%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
@@ -73,6 +61,20 @@
 Obsoletes:     nvidia-x11-drv-97xx < %{version}-%{release}
 Provides:      nvidia-x11-drv-97xx = %{version}-%{release}
 
+%{?filter_setup:
+%filter_from_provides /^libnvidia/d;
+%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGL\.so/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 /^libXvMCNVIDIA_dynamic\.so\.1/d;
+%filter_from_requires /^libglx\.so/d;
+%filter_setup
+}
+
 %description
 This package provides the legacy NVIDIA display driver of the 173xx serie
 which allows for hardware accelerated rendering with NVIDIA chipsets
@@ -113,12 +115,6 @@
 sh %{SOURCE1} --extract-only --target nvidiapkg-x64
 tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
 
-# 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
 %else
@@ -210,12 +206,6 @@
 ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
 ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
 
-# X configuration script
-#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
-
-# Install initscript
-#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
-
 # ld.so.conf.d file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
@@ -228,7 +218,7 @@
 find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
 
 # Remove execstack needs on F-12 and laters
-%if 0
+%if 1
 find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
 execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
 execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -262,12 +252,6 @@
     GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
     /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
   fi
-fi
-if [ -x /usr/sbin/setsebool ] ; then
-  SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
-  if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
-    /usr/sbin/setsebool -P allow_execstack on &>/dev/null
-  fi
 fi ||:
 
 %post libs -p /sbin/ldconfig
@@ -338,6 +322,13 @@
 
 
 %changelog
+* Sat May 19 2012 leigh scott <leigh123linux at googlemail.com> - 173.14.34-1
+- Update to 173.14.34
+
+* Mon Jul 25 2011 Nicolas Chauvet <kwizart at gmail.com> - 173.14.31-1
+- Update to 173.14.31
+- Rebase with main serie packaging improvements
+
 * Sun May 01 2011 Nicolas Chauvet <kwizart at gmail.com> - 173.14.30-1
 - Update to 173.14.30

More information about the rpmfusion-commits mailing list