packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - rel 6 - cr...

[baggins]

Author: baggins                      Date: Mon Feb  6 21:53:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6
- create non-conflicting ld.so configs

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.257 -> 1.258) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.257 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.258
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.257	Mon Feb  6 22:33:16 2012
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Mon Feb  6 22:52:59 2012
@@ -32,7 +32,7 @@
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych AMD/ATI
 Name:		%{pname}
 Version:	12.1
-Release:	5
+Release:	6
 Epoch:		1
 License:	AMD Binary (parts are GPL)
 Group:		X11
@@ -232,7 +232,6 @@
 	$RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors
 
-
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/atieventsd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/atieventsd
 
@@ -263,7 +262,11 @@
 
 cp -r common%{_mandir}/man8/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
+%ifarch %{x8664}
+echo %{_libdir}/fglrx >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/fglrx64.conf
+%else
 echo %{_libdir}/fglrx >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/fglrx.conf
+%endif
 
 cp -r common%{_libdir}/lib* $RPM_BUILD_ROOT%{_libdir}/fglrx
 
@@ -334,7 +337,7 @@
 %dir %{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %{_sysconfdir}/OpenCL/vendors/*.icd
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/fglrx.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/fglrx*.conf
 %dir %{_libdir}/fglrx
 %attr(755,root,root) %{_libdir}/fglrx/libAMDXvBA.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/fglrx/libAMDXvBA.so.1
@@ -390,6 +393,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.258  2012/02/06 21:52:59  baggins
+- rel 6
+- create non-conflicting ld.so configs
+
 Revision 1.257  2012/02/06 21:33:16  baggins
 - xorg configs in driver package
 
================================================================

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