move libglx.so out for /extensions subdir or it gets preferred as opposite of what we want [release 1.15.2-6mamba;Sat Dec 06 2014]

xorg-server.spec

@@ -1,6 +1,6 @@
 Name:          xorg-server
 Version:       1.15.2
-Release:       4mamba
+Release:       6mamba
 Summary:       The core of the X.Org Foundation implementation of the X Window system
 Group:         System/X11
 Vendor:        openmamba
@@ -138,7 +138,8 @@ autoreconf -i || true
   --with-os-name="Linux" \
   --with-os-vendor="openmamba" \
   --enable-aiglx \
-  --with-fop=no
+  --with-fop=no \
+  --without-dtrace
 
 #  --with-mesa-source=`pwd`/Mesa-%{mesa_ver} \
 #  --enable-xgl \
@@ -160,26 +161,13 @@ install -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/xprofile
 install hw/xfree86/parser/xf86Parser.h %{buildroot}%{_includedir}/xorg/
 install hw/xfree86/parser/xf86Optrec.h %{buildroot}%{_includedir}/xorg/
 
+install -d -m0755 %{buildroot}%{_libdir}/xorg/modules/glx-dri
 mv %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
-   %{buildroot}%{_libdir}/xorg/modules/extensions/libglx_dri_so
+   %{buildroot}%{_libdir}/xorg/modules/glx-dri/libglx.so
 
 #mv %{buildroot}%{_libdir}/xorg/modules/extensions/libdri.so \
 #   %{buildroot}%{_libdir}/xorg/modules/extensions/libdri_so
 
-mkdir -p %{buildroot}%{_sbindir}
-cat > %{buildroot}%{_sbindir}/update-alternatives-set-dri << _EOF
-#!/bin/bash
-update-alternatives \
-   --set libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri_so
-
-#update-alternatives \
-#   --set libdri.so %{_libdir}/xorg/modules/extensions/libdri_so
-
-update-alternatives \
-   --set libGL.so.1 %{_libdir}/libGL_so.1.2
-
-_EOF
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -206,17 +194,21 @@ exit 0
 %post -n xorg-ext-libglx
 /usr/sbin/update-alternatives \
    --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri.so 2>/dev/null
+/usr/sbin/update-alternatives \
+   --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx_dri_so 2>/dev/null
+/usr/sbin/update-alternatives \
+   --remove libglx.so %{_libdir}/xorg/modules/extensions/dri/libglx.so 2>/dev/null
    
 /usr/sbin/update-alternatives \
    --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so \
-   %{_libdir}/xorg/modules/extensions/libglx_dri_so 50
+   %{_libdir}/xorg/modules/glx-dri/libglx.so 50
 
 #/usr/sbin/update-alternatives \
 #   --install %{_libdir}/xorg/modules/extensions/libdri.so libdri.so \
 #   %{_libdir}/xorg/modules/extensions/libdri_so 50
 
 [ -e `readlink /etc/alternatives/libglx.so` ] || {
-   update-alternatives-set-dri
+   /usr/sbin/update-alternatives --set libglx.so %{_libdir}/xorg/modules/glx-dri/libglx.so
 }
 exit 0
 
@@ -224,6 +216,10 @@ exit 0
 if [ $1 -eq 0 ]; then
    /usr/sbin/update-alternatives --remove libglx.so \
       %{_libdir}/xorg/modules/extensions/libglx_dri_so
+   /usr/sbin/update-alternatives --remove libglx.so \
+      %{_libdir}/xorg/modules/extensions/dri/libglx.so
+   /usr/sbin/update-alternatives --remove libglx.so \
+      %{_libdir}/xorg/modules/glx-dri/libglx.so
    /usr/sbin/update-alternatives --remove libdri.so \
       %{_libdir}/xorg/modules/extensions/libdri_so
 fi
@@ -235,25 +231,20 @@ exit 0
 %dir %{_sysconfdir}/X11
 %dir %{_sysconfdir}/X11/xorg.conf.d
 %{_sysconfdir}/X11/xkb/compiled/README.compiled
-#%{_sysconfdir}/X11/Xsession.d/92xprint-xpserverlist
 %dir %{_sysconfdir}/xprofile.d
 %{_sysconfdir}/xprofile
 %{_bindir}/X
 %{_bindir}/Xnest
 %{_bindir}/Xorg
-#%{_bindir}/Xprt
 %{_bindir}/Xvfb
 %{_bindir}/cvt
 %{_bindir}/gtf
-%attr(0755,root,root) %{_sbindir}/update-alternatives-set-dri
 %dir %{_libdir}/xorg
 %dir %{_libdir}/xorg/modules
 %{_libdir}/xorg/modules/lib*.la
 %{_libdir}/xorg/modules/lib*.so
-#%{_libdir}/xorg/modules/linux/*
 %{_libdir}/xorg/modules/multimedia/*
 %{_libdir}/xorg/protocol.txt
-#%{_libdir}/xserver/SecurityPolicy
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/xorg.conf.d
 %{_datadir}/X11/xorg.conf.d/10-evdev.conf
@@ -291,22 +282,27 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
-#%{_includedir}/X11/bitmaps/*
-#%{_includedir}/X11/pixmaps/*
 %dir %{_includedir}/xorg
 %{_includedir}/xorg/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/xorg-server.m4
-%dir %{_docdir}/xorg-server
+#%dir %{_docdir}/xorg-server
-%{_docdir}/xorg-server/Xserver-DTrace*
+#%{_docdir}/xorg-server/Xserver-DTrace*
 
 %files -n xorg-ext-libglx
 %defattr(-,root,root)
 %dir %{_libdir}/xorg/modules/extensions
 %{_libdir}/xorg/modules/extensions/libglx.la
-%{_libdir}/xorg/modules/extensions/libglx_dri_so
+%dir %{_libdir}/xorg/modules/glx-dri
+%{_libdir}/xorg/modules/glx-dri/libglx.so
 
 %changelog
+* Sat Dec 06 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-6mamba
+- move libglx.so out for /extensions subdir or it gets preferred as opposite of what we want
+
+* Thu Dec 04 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-5mamba
+- more libglx.so under extensions/dri instead of renaming; don't provide update-alternatives-set-dri (-> postplug)
+
 * Wed Sep 10 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-4mamba
 - arm: patch to fi libunwind build and hopefully crash at X startup