SPECS: xorg-driver-video-fglrx.spec - better macros usage - packag...

[qboosh]

Author: qboosh                       Date: Sun Aug 26 23:46:50 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- better macros usage
- package libGL.so.1 symlink as ghost
- esut.a old-style module moved from -static to base

---- Files affected:
SPECS:
   xorg-driver-video-fglrx.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.42 SPECS/xorg-driver-video-fglrx.spec:1.43
--- SPECS/xorg-driver-video-fglrx.spec:1.42	Mon Aug 20 11:44:40 2007
+++ SPECS/xorg-driver-video-fglrx.spec	Mon Aug 27 01:46:45 2007
@@ -13,7 +13,7 @@
 %endif
 
 %ifarch %{ix86}
-%define		arch_sufix	""
+%define		arch_sufix	%{nil}
 %define		arch_dir	x86
 %else
 %define		arch_sufix	_64a
@@ -125,9 +125,9 @@
 cd -
 
 install -d common%{_prefix}/{%{_lib},bin}
-cp -r %{x11ver}%{arch_sufix}%{_prefix}/X11R6/%{_lib}/* common%{_libdir}
-cp -r arch/%{arch_dir}%{_prefix}/X11R6/%{_lib}/* common%{_libdir}
-cp -r arch/%{arch_dir}%{_prefix}/X11R6/bin/* common%{_bindir}
+cp -r %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
+cp -r arch/%{arch_dir}/usr/X11R6/%{_lib}/* common%{_libdir}
+cp -r arch/%{arch_dir}/usr/X11R6/bin/* common%{_bindir}
 
 %build
 %if %{with kernel}
@@ -158,7 +158,7 @@
 ln -sf libGL.so.1.2 $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
 
 install common%{_includedir}/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
-install common%{_prefix}/X11R6/include/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
+install common/usr/X11R6/include/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
 echo "LIBGL_DRIVERS_PATH=%{_libdir}/xorg/modules/dri" > $RPM_BUILD_ROOT%{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
 
 cd $RPM_BUILD_ROOT%{_libdir}
@@ -189,7 +189,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
-%attr(755,root,root) %{_libdir}/libGL.so.1
+%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libfglrx_dm.so.*.*
 %attr(755,root,root) %{_libdir}/libfglrx_gamma.so.*.*
@@ -199,18 +199,24 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/fglrx_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/linux/libfglrxdrm.so
 %attr(755,root,root) %{_libdir}/xorg/modules/glesx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/esut.a
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libfglrx_*so
+%attr(755,root,root) %{_libdir}/libfglrx_dm.so
+%attr(755,root,root) %{_libdir}/libfglrx_gamma.so
+%attr(755,root,root) %{_libdir}/libfglrx_pp.so
+%attr(755,root,root) %{_libdir}/libfglrx_tvout.so
 %{_includedir}/GL/glATI.h
 %{_includedir}/GL/glxATI.h
 %{_includedir}/X11/extensions/fglrx_gamma.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libfglrx_*.a
-%{_libdir}/xorg/modules/esut.a
+%{_libdir}/libfglrx_dm.a
+%{_libdir}/libfglrx_gamma.a
+%{_libdir}/libfglrx_pp.a
+%{_libdir}/libfglrx_tvout.a
 %endif
 
 %if %{with kernel}
@@ -225,6 +231,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2007/08/26 23:46:45  qboosh
+- better macros usage
+- package libGL.so.1 symlink as ghost
+- esut.a old-style module moved from -static to base
+
 Revision 1.42  2007/08/20 09:44:40  vip
 - up to 8.40.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-fglrx.spec?r1=1.42&r2=1.43&f=u