packages: xorg-xserver-server/xorg-xserver-server.spec - dropped multigl bcond

[baggins]

Author: baggins                      Date: Mon Feb  6 21:40:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped multigl bcond

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.299 -> 1.300) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.299 packages/xorg-xserver-server/xorg-xserver-server.spec:1.300
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.299	Sat Jan 28 08:31:03 2012
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Mon Feb  6 22:40:22 2012
@@ -2,7 +2,6 @@
 # TODO: consider XSELINUX
 #
 # Conditional build:
-%bcond_with	multigl		# package libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_with	dbus		# D-BUS support for configuration (if no udev)
 %bcond_with	hal		# HAL support for configuration (if no udev)
 %bcond_without	udev		# UDEV support for configuration
@@ -22,12 +21,11 @@
 #
 %define	pixman_ver	0.24.0
 
-%define		rel	1
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
 Version:	1.11.4
-Release:	%{rel}%{?with_multigl:.mgl}
+Release:	1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -160,11 +158,6 @@
 # avoid self-dependencies on included modules
 %define		_noautoreq	libscanpci.so libxf1bpp.so
 
-%if %{with multigl}
-# executable Xorg provides symbols this library:
-%define		skip_post_check_so	libglx.so.*
-%endif
-
 %description
 Xorg server is a generally used X server which uses display hardware.
 It requires proper driver for your display hardware.
@@ -343,10 +336,6 @@
 Group:		X11/Servers
 Requires:	%{name} = %{version}-%{release}
 Provides:	xorg-xserver-module(dri)
-%if %{without multigl}
-Conflicts:	xorg-driver-video-fglrx
-Conflicts:	xorg-driver-video-nvidia
-%endif
 
 %description -n xorg-xserver-libdri
 DRI extension library for X.org server.
@@ -365,10 +354,6 @@
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
-%if %{without multigl}
-Conflicts:	xorg-driver-video-fglrx
-Conflicts:	xorg-driver-video-nvidia
-%endif
 
 %description -n xorg-xserver-libglx
 GLX extension library for X.org server.
@@ -474,13 +459,6 @@
 install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/Xvfb
 cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/Xvfb
 
-%if %{with multigl}
-cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-mv -f libglx.so libglx.so.%{version}
-ln -sf libglx.so.%{version} libglx.so
-cd -
-%endif
-
 install -d $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
 cp -a * $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
 cd $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
@@ -491,13 +469,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with multigl}
-%post -n xorg-xserver-libglx
-if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
-	ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
-fi
-%endif
-
 %triggerpostun -- xorg-xserver-server < 1.5.0
 if [ -f /etc/X11/xorg.conf ]; then
 	sed -i -e 's/^\s*RgbPath.*$/#& # obsolete option/' /etc/X11/xorg.conf
@@ -625,12 +596,7 @@
 
 %files -n xorg-xserver-libglx
 %defattr(644,root,root,755)
-%if %{with multigl}
-%ghost %{_libdir}/xorg/modules/extensions/libglx.so
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.%{version}
-%else
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -638,6 +604,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.300  2012/02/06 21:40:22  baggins
+- dropped multigl bcond
+
 Revision 1.299  2012/01/28 07:31:03  lmasko
 - Up to 1.11.4.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.299&r2=1.300&f=u