Author: hawk Date: Wed Oct 11 11:47:54 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - update to 7184 - killed duplicate "install -d" - do clean up before compiling anything, otherwise UP module gets SMP vermagic
---- Files affected: SPECS: X11-driver-nvidia-legacy.spec (1.29 -> 1.30) ---- Diffs: ================================================================ Index: SPECS/X11-driver-nvidia-legacy.spec diff -u SPECS/X11-driver-nvidia-legacy.spec:1.29 SPECS/X11-driver-nvidia-legacy.spec:1.30 --- SPECS/X11-driver-nvidia-legacy.spec:1.29 Sat Jul 22 21:03:04 2006 +++ SPECS/X11-driver-nvidia-legacy.spec Wed Oct 11 13:47:49 2006 @@ -8,9 +8,9 @@ # ### 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 3 +%define _rel 1 ##################################### # %define oldname X11-driver-nvidia @@ -24,9 +24,9 @@ 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 @@ -194,6 +194,7 @@ 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 @@ -201,7 +202,6 @@ %if %{with dist_kernel} %{__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 @@ -230,7 +230,7 @@ ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir} -install usr/share/doc/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} +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} @@ -358,6 +358,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2006/10/11 11:47:49 hawk +- update to 7184 +- killed duplicate "install -d" +- do clean up before compiling anything, otherwise UP module gets SMP vermagic + Revision 1.29 2006/07/22 19:03:04 havner - merge X11-driver-nvidia changes - rel 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
