packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - merged lib...

[baggins]

Author: baggins                      Date: Sat Jul 17 10:41:32 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged libglx with main package

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

---- 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.173 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.174
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.173	Sat Jul 17 12:38:21 2010
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Sat Jul 17 12:41:27 2010
@@ -55,12 +55,12 @@
 BuildRequires:	xorg-proto-recordproto-devel
 BuildRequires:	xorg-proto-xf86miscproto-devel
 BuildRequires:	xorg-proto-xf86vidmodeproto-devel
-Requires:	%{pname}-libglx = %{epoch}:%{version}-%{release}
 Requires:	xorg-xserver-server
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Requires:	xorg-xserver-server(videodrv-abi) <= 7.0
 Provides:	OpenGL = 2.0
 Provides:	OpenGL-GLX = 1.4
+Provides:	xorg-xserver-module(glx)
 # hack to make OpenGL ABI compatible
 %ifarch %{x8664}
 Provides:	libGL.so.1()(64bit)
@@ -76,6 +76,9 @@
 Obsoletes:	XFree86-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-driver-firegl < 1:7.0.0
 Obsoletes:	xorg-driver-video-fglrx-libdri
+Obsoletes:	xorg-driver-video-fglrx-libglx
+Conflicts:	xorg-driver-video-nvidia
+Conflicts:	xorg-xserver-libglx
 ExclusiveArch:	i586 i686 athlon pentium3 pentium4 %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,20 +97,6 @@
 dostarcza sterowniki obsługujące wyświetlanie 2D oraz sprzętowo
 akcelerowany OpenGL.
 
-%package libglx
-Summary:	GLX extension library for X.org server with fglrx driver
-Summary(pl.UTF-8):	Biblioteka rozszerzenia GLX dla serwera X.org ze sterownikiem fglrx
-Group:		X11/Servers
-Provides:	xorg-xserver-module(glx)
-Conflicts:	xorg-driver-video-nvidia
-Conflicts:	xorg-xserver-libglx
-
-%description libglx
-GLX extension library for X.org server with fglrx driver.
-
-%description libglx -l pl.UTF-8
-Biblioteka rozszerzenia GLX dla serwera X.org with fglrx driver.
-
 %package devel
 Summary:	Header files for development for the ATI Radeon cards proprietary driver
 Summary(pl.UTF-8):	Pliki nagłówkowe do programowania z użyciem własnościowego sterownika dla kart ATI Radeon
@@ -298,6 +287,7 @@
 %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
 %{_libdir}/dri
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/fglrx_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/fglrx_drv.so
@@ -305,10 +295,6 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/amdxmm.so
 %attr(755,root,root) %{_libdir}/xorg/modules/glesx.so
 
-%files libglx
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
-
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfglrx_dm.so
@@ -337,6 +323,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2010/07/17 10:41:27  baggins
+- merged libglx with main package
+
 Revision 1.173  2010/07/17 10:38:21  baggins
 - removed ifarch as they were 'if 1'
 
================================================================

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