Author: arekm Date: Sun Dec 28 14:08:55 2008 GMT
Module: SPECS Tag: XORG_XSERVER_1_5
---- Log message:
- rel 6; merge dri split from head
---- Files affected:
SPECS:
xorg-xserver-server.spec (1.152.2.2 -> 1.152.2.3)
---- Diffs:
================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.152.2.2
SPECS/xorg-xserver-server.spec:1.152.2.3
--- SPECS/xorg-xserver-server.spec:1.152.2.2 Fri Nov 28 08:57:07 2008
+++ SPECS/xorg-xserver-server.spec Sun Dec 28 15:08:49 2008
@@ -18,7 +18,7 @@
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
Version: 1.5.3
-Release: 5%{?with_multigl:.mgl}
+Release: 6%{?with_multigl:.mgl}
License: MIT
Group: X11/Servers
Source0:
http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -274,22 +274,41 @@
utworzenia początkowego pliku konfiguracyjnego lub dokonania
modyfikacji istniejącej konfiguracji.
+%package -n xorg-xserver-libdri
+Summary: DRI extension library for X.org server
+Summary(pl.UTF-8): Biblioteka rozszerzenia DRI dla serwera X.org
+Group: X11/Servers
+Requires: %{name} = %{version}-%{release}
+Provides: xorg-xserver-module(dri)
+%if %{without multigl}
+Conflicts: xorg-driver-video-nvidia
+Conflicts: xorg-driver-video-fglrx-libdri
+%endif
+
+%description -n xorg-xserver-libdri
+DRI extension library for X.org server.
+
+%description -n xorg-xserver-libdri -l pl.UTF-8
+Biblioteka rozszerzenia DRI dla serwera X.org.
+
%package -n xorg-xserver-libglx
-Summary: GLX extension library fo X.org server
+Summary: GLX extension library for X.org server
Summary(pl.UTF-8): Biblioteka rozszerzenia GLX dla serwera X.org
Group: X11/Servers
Requires: %{name} = %{version}-%{release}
+Requires: xorg-xserver-libdri = %{version}-%{release}
# Mesa version glapi tables in glx/ dir come from
Provides: xorg-xserver-libglx(glapi) = 7.1.0
-Provides: xorg-xserver-modules-libglx
+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-nvidia
+Conflicts: xorg-driver-video-fglrx-libglx
%endif
%description -n xorg-xserver-libglx
-GLX extension library fo X.org server.
+GLX extension library for X.org server.
%description -n xorg-xserver-libglx -l pl.UTF-8
Biblioteka rozszerzenia GLX dla serwera X.org.
@@ -430,7 +449,6 @@
%dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/extensions
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
%{?with_dri2:%attr(755,root,root)
%{_libdir}/xorg/modules/extensions/libdri2.so}
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
%{?with_record:%attr(755,root,root)
%{_libdir}/xorg/modules/extensions/librecord.so}
@@ -501,6 +519,10 @@
%{_datadir}/X11/app-defaults/XOrgCfg
%{_mandir}/man1/xorgcfg.1x*
+%files -n xorg-xserver-libdri
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
+
%files -n xorg-xserver-libglx
%defattr(644,root,root,755)
%if %{with multigl}
@@ -516,6 +538,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.152.2.3 2008/12/28 14:08:49 arekm
+- rel 6; merge dri split from head
+
Revision 1.152.2.2 2008/11/28 07:57:07 arekm
- dri2 devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.152.2.2&r2=1.152.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
