SPECS: xorg-driver-video-nvidia-legacy.spec - complete %{_perfix}/...

[twittner]

Author: twittner                     Date: Thu Jul 19 18:51:01 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- complete %{_perfix}/%{_lib} -> %{_libdir} changes. Since xorg uses
  /usr as prefix not /usr/X11R6 so there is not difference between
  %{_perfix}/%{_lib} and %{_libdir}

---- Files affected:
SPECS:
   xorg-driver-video-nvidia-legacy.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.33 SPECS/xorg-driver-video-nvidia-legacy.spec:1.34
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.33	Thu Jul 19 19:22:52 2007
+++ SPECS/xorg-driver-video-nvidia-legacy.spec	Thu Jul 19 20:50:56 2007
@@ -28,8 +28,8 @@
 # http://www.minion.de/files/1.0-6629/
 URL:		http://www.nvidia.com/object/linux.html
 BuildRequires:	%{kgcc_package}
-%if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+%if %{with kernel} && %{with dist_kernel}
+BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildConflicts:	XFree86-nvidia
@@ -160,13 +160,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
-$RPM_BUILD_ROOT{%{_includedir}/GL,%{_prefix}/%{_lib}/tls,%{_bindir}}
+install -d $RPM_BUILD_ROOT%{_libdir}/{tls,xorg/modules/{drivers,extensions}} \
+$RPM_BUILD_ROOT{%{_includedir}/GL,%{_bindir}}
 
 ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
 install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
-install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_prefix}/%{_lib}
+install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
 
@@ -187,8 +187,8 @@
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 
 # OpenGL ABI for Linux compatibility
-ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libGL.so.1
-ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libGL.so
+ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
+ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT%{_libdir}/libGL.so
 
 %if %{with kernel}
 %install_kernel_modules -m usr/src/nv/nvidia -d misc
@@ -252,6 +252,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2007/07/19 18:50:56  twittner
+- complete %{_perfix}/%{_lib} -> %{_libdir} changes. Since xorg uses
+  /usr as prefix not /usr/X11R6 so there is not difference between
+  %{_perfix}/%{_lib} and %{_libdir}
+
 Revision 1.33  2007/07/19 17:22:52  twittner
 - up to 1.0-7185
 - %files fixes - please check it - rel. 0.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-driver-video-nvidia-legacy.spec?r1=1.33&r2=1.34&f=u