move libGL.so.1.2* under %{_libdir}/mesa to prevent libGL.so.1 from being overwritten by ldconfig [release 10.3.4-2mamba;Thu Dec 04 2014]

Mesa.spec

@@ -11,7 +11,7 @@
 Name:          Mesa
 Epoch:         1
 Version:       10.3.4
-Release:       1mamba
+Release:       2mamba
 Summary:       A 3-D graphics library with an API which is very similar to that of OpenGL
 Group:         System/Libraries
 Vendor:        openmamba
@@ -380,7 +380,12 @@ export CXXFLAGS="%{optflags} -std=c++11"
 #mv %{buildroot}%{_libdir}/libGL.so.%{dri_libglver} \
 #   %{buildroot}%{_libdir}/libGL_so.%{dri_libglver}
 
-ln -s libGL.so.1.2.0 %{buildroot}%{_libdir}/libGL_so.1.2
+# move libGL.so.1.2* under %{_libdir}/mesa to prevent
+# libGL.so.1 from being overwritten by ldconfig
+install -d -m0755 %{buildroot}%{_libdir}/mesa
+mv %{buildroot}%{_libdir}/libGL.so.1.2.0 %{buildroot}%{_libdir}/mesa/
+ln -s libGL.so.1.2.0 %{buildroot}%{_libdir}/mesa/libGL.so.1.2
+ln -sf mesa/libGL.so.1.2.0 %{buildroot}%{_libdir}/libGL.so
 
 ##remove the include that conflicts with liglew
 #pushd %{buildroot}%{_includedir}/GL
@@ -403,16 +408,19 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 %post -n libGL-Mesa-dri
 if [ $1 -ge 1 ]; then
+   # remove old alternative
+   /usr/sbin/update-alternatives --remove libGL.so.1 \
+      %{_libdir}/libGL_so.%{dri_libglver} &>/dev/null
    /usr/sbin/update-alternatives \
       --install %{_libdir}/libGL.so.1 libGL.so.1 \
-      %{_libdir}/libGL_so.%{dri_libglver} 50
+      %{_libdir}/mesa/libGL.so.%{dri_libglver} 50
 fi
 exit 0
 
 %preun -n libGL-Mesa-dri
 if [ $1 -eq 0 ]; then
    /usr/sbin/update-alternatives --remove libGL.so.1 \
-      %{_libdir}/libGL_so.%{dri_libglver}
+      %{_libdir}/mesa/libGL.so.%{dri_libglver}
 fi
 exit 0
 
@@ -494,8 +502,8 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %files -n libGL-Mesa-dri
 %defattr(-,root,root)
 %{_sysconfdir}/drirc
-%{_libdir}/libGL.so.1.2.0
-%{_libdir}/libGL_so.*
+%dir %{_libdir}/mesa
+%{_libdir}/mesa/libGL.so.*
 %{_libdir}/bellagio/libomx_mesa.la
 %{_libdir}/bellagio/libomx_mesa.so
 #%{_libdir}/bellagio/libomx_nouveau.la
@@ -636,6 +644,9 @@ sed -i "s|%{_prefix}/lib/libGL.la||" %{_libdir}/*.la
 %endif
 
 %changelog
+* Thu Dec 04 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 10.3.4-2mamba
+-  move libGL.so.1.2* under %{_libdir}/mesa to prevent libGL.so.1 from being overwritten by ldconfig
+
 * Sat Nov 22 2014 Automatic Build System <autodist@mambasoft.it> 10.3.4-1mamba
 - automatic version update by autodist