packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - fixed mult...

[baggins]

Author: baggins                      Date: Sat Jul 17 10:51:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed multigl bcond wrt libglx

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.174 -> 1.175) 

---- 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.174 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.175
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.174	Sat Jul 17 12:41:27 2010
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Sat Jul 17 12:51:38 2010
@@ -77,8 +77,10 @@
 Obsoletes:	XFree86-driver-firegl < 1:7.0.0
 Obsoletes:	xorg-driver-video-fglrx-libdri
 Obsoletes:	xorg-driver-video-fglrx-libglx
+%if %{without multigl}
 Conflicts:	xorg-driver-video-nvidia
 Conflicts:	xorg-xserver-libglx
+%endif
 ExclusiveArch:	i586 i686 athlon pentium3 pentium4 %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -206,6 +208,9 @@
 cp -r common%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libdir}
 cp -r common%{_libdir}/lib*.so* $RPM_BUILD_ROOT%{_libdir}/fglrx
 
+mv -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/{libglx.so,libglx.so.%{version}}
+ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
+
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/fglrx
 ln -sf fglrx/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 %else
@@ -232,7 +237,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with multigl}
+%post
+/sbin/ldconfig
+if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
+	ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
+fi
+%else
 %post	-p /sbin/ldconfig
+%endif
+
 %postun	-p /sbin/ldconfig
 
 %post	-n kernel%{_alt_kernel}-video-firegl
@@ -271,6 +285,8 @@
 %attr(755,root,root) %{_libdir}/fglrx/libfglrx_dm.so.*.*
 %attr(755,root,root) %{_libdir}/fglrx/libfglrx_gamma.so.*.*
 %attr(755,root,root) %{_libdir}/fglrx/libfglrx_gamma.so.1
+%ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.%{version}
 %else
 %attr(755,root,root) %{_libdir}/libAMDXvBA.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libAMDXvBA.so.1
@@ -286,8 +302,8 @@
 %attr(755,root,root) %{_libdir}/libfglrx_dm.so.*.*
 %attr(755,root,root) %{_libdir}/libfglrx_gamma.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfglrx_gamma.so.1
-%endif
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
+%endif
 %{_libdir}/dri
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/fglrx_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/fglrx_drv.so
@@ -323,6 +339,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.175  2010/07/17 10:51:38  baggins
+- fixed multigl bcond wrt libglx
+
 Revision 1.174  2010/07/17 10:41:27  baggins
 - merged libglx with main package
 
================================================================

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