- do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly

[packages/X11-driver-nvidia-legacy.git] / X11-driver-nvidia-legacy.spec

diff --git a/X11-driver-nvidia-legacy.spec b/X11-driver-nvidia-legacy.spec
index 0c6922365b36276f6f5641ec24cbb4a67f175288..fb36ff6f83d65fc56ecbfffc368b87235bb9efe8 100644 (file)
--- a/X11-driver-nvidia-legacy.spec
+++ b/X11-driver-nvidia-legacy.spec
@@ -7,7 +7,7 @@
 #
 ### DON'T CHANGE THIS ###############
 %define                _nv_ver         1.0
-%define                _nv_rel         7182
+%define                _nv_rel         7184
 %define                _min_x11        6.7.0
 %define                _rel            1
 #####################################
@@ -23,15 +23,14 @@ License:    nVidia Binary
 Group:         X11
 # why not pkg0!?
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: a7c84815943dc4784a207608abf2e5d6
+# Source0-md5: 68cf7f155786daf6946b9daeb64c7a35
 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run
-# Source1-md5: 5a670a73a8887bdc776064aecae8f769
+# Source1-md5: 332850387c4e7a4619753b856e3199e5
+Source2:       %{oldname}-settings.desktop
+Source3:       %{oldname}-xinitrc.sh
 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch
-Patch2:                %{name}-conftest.patch
-Patch3:                %{name}-verbose.patch
-Patch4:                %{name}-build-fix.patch
-# http://www.minion.de/files/1.0-6629/
+Patch2:                %{name}-verbose.patch
 URL:           http://www.nvidia.com/object/linux.html
 BuildRequires: %{kgcc_package}
 #BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
@@ -179,13 +178,11 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 /bin/sh %{SOURCE1} --extract-only
 %setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2
 %endif
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 %if %{with verbose}
-%patch3 -p0
+%patch2 -p0
 %endif
-#%patch4 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -196,14 +193,14 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
                exit 1
        fi
+       rm -rf o
        install -d o/include/linux
        ln -sf %{_kernelsrcdir}/config-$cfg o/.config
        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
 %if %{with dist_kernel}
-       %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
-       install -d o/include/config
        touch o/include/config/MARKER
        ln -sf %{_kernelsrcdir}/scripts o/scripts
 %endif
@@ -226,11 +223,15 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
-       $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}}
+       $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}} \
+       $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},/etc/X11/xinit/xinitrc.d}
 
 ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
 install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/nvidia-settings.desktop
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}
 install usr/lib/tls/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}/tls
 install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -247,7 +248,6 @@ install usr/X11R6/lib/modules/drivers/nvidia_drv.o $RPM_BUILD_ROOT%{_libdir}/mod
 install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
 install usr/include/GL/*.h     $RPM_BUILD_ROOT/usr/include/GL
-#install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
 
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/modules/extensions/libglx.so
@@ -347,3 +347,6 @@ EOF
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+%{_desktopdir}/*.desktop
+%{_pixmapsdir}/*