Fix f14 installation regression

14 years ago · b4ec424f10
parent cc24744829
commit b4ec424f10
3 changed files with 57 additions and 18 deletions
--- a/00-nvidia.conf
+++ b/00-nvidia.conf
@ -0,0 +1,7 @@
+#This file is provided by xorg-x11-drv-nvidia
+#Do not edit
+
+Section "Files"
+	ModulePath   "@LIBDIR@/xorg/modules/extensions/nvidia"
+	ModulePath   "@LIBDIR@/xorg/modules"
+EndSection
--- a/nvidia-xorg.conf
+++ b/nvidia-xorg.conf
@ -0,0 +1,6 @@
+# RPM Fusion - nvidia-xorg.conf
+# 
+Section "Device"
+	Identifier  "Videocard0"
+	Driver      "nvidia"
+EndSection
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@ -9,7 +9,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         260.19.12
-Release:         3%{?dist}
+Release:         4%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards

 Group:           User Interface/X Hardware Support
@ -17,9 +17,11 @@ License:         Redistributable, no modification permitted
 URL:             http://www.nvidia.com/
 Source0:         ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
 Source1:         ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-Source5:         nvidia-init
+Source2:         00-nvidia.conf
+Source3:         nvidia-xorg.conf
+#Source5:         nvidia-init
 Source6:         blacklist-nouveau.conf
-Source10:        nvidia-config-display
+#Source10:        nvidia-config-display
 Source11:        nvidia-README.Fedora
 # So we don't pull other nvidia variants
 Source91:        filter-requires.sh
@ -46,18 +48,18 @@ Requires(post):  nvidia-kmod >= %{version}
 # Needed in all nvidia or fglrx driver packages
 BuildRequires:   prelink
 Requires:        which
-Requires:        livna-config-display >= 0.0.21
+#Requires:        livna-config-display >= 0.0.21
 %if 0%{?fedora} > 10 || 0%{?rhel} > 5
 Requires:        %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
 %else
 Requires:        %{name}-libs-%{_target_cpu} = %{version}-%{release}
 %endif

-Requires(post):  livna-config-display
-Requires(preun): livna-config-display
-Requires(post):  chkconfig
+#Requires(post):  livna-config-display
+#Requires(preun): livna-config-display
+#Requires(post):  chkconfig
 Requires(post):  ldconfig
-Requires(preun): chkconfig
+#Requires(preun): chkconfig


 Provides:        nvidia-kmod-common = %{?epoch}:%{version}
@ -90,7 +92,11 @@ for driver version %{version}.
 %package devel
 Summary:         Development files for %{name}
 Group:           Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires:        %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
 Requires:        %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+%endif
 #Introduced in F10 when 173xx has forked to legacy serie
 Obsoletes:       xorg-x11-drv-nvidia-newest-devel < %{version}-100
 Provides:        xorg-x11-drv-nvidia-newest-devel = %{version}-101
@ -170,7 +176,7 @@ install    -m 0755 -d         $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
 install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/

 # Install initscript
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
+#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia

 # OpenCL config
 install    -m 0755         -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
@ -218,7 +224,7 @@ ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so


 # X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
+#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display

 # Install nvidia icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@ -235,6 +241,13 @@ execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi
 %endif
 %endif

+#Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+

 %clean
 rm -rf $RPM_BUILD_ROOT
@ -242,10 +255,10 @@ rm -rf $RPM_BUILD_ROOT
 %post
 if [ "$1" -eq "1" ]; then
  # Enable nvidia driver when installing
-  %{_sbindir}/nvidia-config-display enable &>/dev/null ||:
+  #%{_sbindir}/nvidia-config-display enable &>/dev/null ||:
  # Add init script and start it
-  /sbin/chkconfig --add nvidia ||:
-  /etc/init.d/nvidia start &>/dev/null ||:
+  #/sbin/chkconfig --add nvidia ||:
+  #/etc/init.d/nvidia start &>/dev/null ||:
  if [ -x /sbin/grubby ] ; then
    GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
    /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
@ -260,12 +273,16 @@ fi ||:

 %post libs -p /sbin/ldconfig

+%posttrans
+ [ -f %{_sysconfdir}/X11/xorg.conf ] || \
+   cp -p %{_sysconfdir}/X11/nvidia-xorg.conf %{_sysconfdir}/X11/xorg.conf || :
+
 %preun
 if [ "$1" -eq "0" ]; then
    # Disable driver on final removal
-    test -f %{_sbindir}/nvidia-config-display && %{_sbindir}/nvidia-config-display disable &>/dev/null
-    %{_initrddir}/nvidia stop &>/dev/null
-    /sbin/chkconfig --del nvidia &>/dev/null
+    #test -f %{_sbindir}/nvidia-config-display && %{_sbindir}/nvidia-config-display disable &>/dev/null
+    #%{_initrddir}/nvidia stop &>/dev/null
+    #/sbin/chkconfig --del nvidia &>/dev/null
    #Clear grub option to disable nouveau for all kernels
    if [ -x /sbin/grubby ] ; then
      KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)`
@ -291,11 +308,13 @@ fi ||:
 %dir %{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
+%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
-%{_initrddir}/nvidia
+%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
+#{_initrddir}/nvidia
 %{_bindir}/nvidia-bug-report.sh
 %{_bindir}/nvidia-smi
-%{_sbindir}/nvidia-config-display
+#{_sbindir}/nvidia-config-display
 # Xorg libs that do not need to be multilib
 %dir %{_libdir}/xorg/modules/extensions/nvidia
 %{_libdir}/xorg/modules/drivers/nvidia_drv.so
@ -329,6 +348,13 @@ fi ||:


 %changelog
+* Tue Nov 02 2010 Nicolas Chauvet <kwizart@gmail.com> - 1:260.19.12-4
+- Disable selinux restorecon on initscript.
+- Avoid using livna-config-display on fedora 14 and later
+  because of rhbz#623742
+- Use static workaround
+- Explicitely use %%{_isa} dependency from -devel to -libs
+
 * Sun Oct 24 2010 Nicolas Chauvet <kwizart@gmail.com> - 1:260.19.12-3
 - Improve uninstallation script rfbz#1398
 - Fix selinux context on device creation rfbz#1421