SPECS: X11.spec - release 11.1 - separated DRI stuff fro drivers t...

Wed Aug 23 13:57:10 CEST 2006

Author: baggins                      Date: Wed Aug 23 11:57:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 11.1
- separated DRI stuff fro drivers to driver-*-dri subpackages
- pl xterm resources are back but now containing translations only

---- Files affected:
SPECS:
   X11.spec (1.198 -> 1.199) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.198 SPECS/X11.spec:1.199

--- SPECS/X11.spec:1.198	Mon Aug 21 13:07:33 2006
+++ SPECS/X11.spec	Wed Aug 23 13:57:02 2006
@@ -28,7 +28,7 @@
 Summary(zh_CN):	XOrg X11 ´°żÚĎľÍłˇţÎńĆ÷şÍťůąžłĚĐň
 Name:		X11
 Version:	6.9.0
-Release:	11
+Release:	11.1
 Epoch:		1
 License:	MIT/X Consortium/BSD (see README)
 Group:		X11
@@ -820,20 +820,32 @@
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes:	XFree86-Rage128
+Obsoletes:	XFree86-driver-r128
+
+%description driver-r128
+ATI Rage 128 video driver.
+
+%description driver-r128 -l pl
+Sterownik do kart ATI Rage 128.
+
+%package driver-r128-dri
+Summary:	DRI modules for ATI Rage 128 video driver
+Summary(pl):	Moduły DRI dla sterownika do kart ATI Rage 128
+Group:		X11/Servers
+Requires:	%{name}-driver-r128 = %{epoch}:%{version}-%{release}
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
 Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
 # -libs already required by -OpenGL-libGL
 %endif
-Obsoletes:	XFree86-Rage128
-Obsoletes:	XFree86-driver-r128
 
 %description driver-r128
-ATI Rage 128 video driver.
+DRI modules for ATI Rage 128 video driver.
 
 %description driver-r128 -l pl
-Sterownik do kart ATI Rage 128.
+Moduły DRI dla sterownika do kart ATI Rage 128.
 
 %package driver-radeon
 Summary:	ATI Radeon video driver
@@ -842,19 +854,31 @@
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:	%{name}-driver-ati = %{epoch}:%{version}-%{release}
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes:	XFree86-driver-radeon
+
+%description driver-radeon
+ATI Radeon video driver.
+
+%description driver-radeon -l pl
+Sterownik do kart ATI Radeon.
+
+%package driver-radeon-dri
+Summary:	DRI modules for ATI Radeon video driver
+Summary(pl):	Moduły DRI dla sterownika do kart ATI Radeon
+Group:		X11/Servers
+Requires:	%{name}-driver-radeon = %{epoch}:%{version}-%{release}
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
 Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
 # -libs already required by -OpenGL-libGL
 %endif
-Obsoletes:	XFree86-driver-radeon
 
-%description driver-radeon
-ATI Radeon video driver.
+%description driver-radeon-dri
+DRI modules for ATI Radeon video driver.
 
-%description driver-radeon -l pl
-Sterownik do kart ATI Radeon.
+%description driver-radeon-dri -l pl
+Moduły DRI dla sterownika do kart ATI Radeon.
 
 %package driver-chips
 Summary:	Chips and Technologies video driver
@@ -952,12 +976,6 @@
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-# for dri
-Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
 Obsoletes:	XFree86-3DLabs
 Obsoletes:	XFree86-driver-glint
 
@@ -967,6 +985,24 @@
 %description driver-glint -l pl
 Sterownik do kart GLINT i Permedia.
 
+%package driver-glint-dri
+Summary:	DRI modules for GLINT/Permedia video driver
+Summary(pl):	Moduły DRI dla sterownika do kart GLINT i Permedia
+Group:		X11/Servers
+Requires:	%{name}-driver-glint = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-glint-dri
+DRI modules for GLINT/Permedia video driver.
+
+%description driver-glint-dri -l pl
+Moduły DRI dla sterownika do kart GLINT i Permedia.
+
 %package driver-i128
 Summary:	Number 9 I128 video driver
 Summary(pl):	Sterownik do kart Number 9 I128
@@ -1016,12 +1052,6 @@
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64
-# for dri
-Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
 Obsoletes:	XFree86-driver-i810
 Obsoletes:	XFree86-i810
 
@@ -1031,6 +1061,24 @@
 %description driver-i810 -l pl
 Sterownik do grafiki na układach Intel i810/i815/i830.
 
+%package driver-i810-dri
+Summary:	DRI modules dor Intel i810/i815/i830 video driver
+Summary(pl):	Moduły DRI dla sterownika do grafiki na układach Intel i810/i815/i830
+Group:		X11/Servers
+Requires:	%{name}-driver-i810 = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64
+# for dri
+Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-i810-dri
+DRI modules dor Intel i810/i815/i830 video driver.
+
+%description driver-i810-dri -l pl
+Moduły DRI dla sterownika do grafiki na układach Intel i810/i815/i830.
+
 %package driver-imstt
 Summary:	Integrated Micro Solutions Twin Turbo 128 driver
 Summary(pl):	Sterownik do kart Integrated Micro Solutions Twin Turbo 128
@@ -1051,12 +1099,6 @@
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-# for dri
-Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
 Obsoletes:	XFree86-driver-mga
 Obsoletes:	XFree86-mga
 
@@ -1066,6 +1108,24 @@
 %description driver-mga -l pl
 Sterownik do kart Matrox.
 
+%package driver-mga-dri
+Summary:	DRI modules for Matrox video driver
+Summary(pl):	Moduly DRI dla sterownika do kart Matrox
+Group:		X11/Servers
+Requires:	%{name}-driver-mga = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-mga-dri
+DRI modules for Matrox video driver.
+
+%description driver-mga-dri -l pl
+Moduly DRI dla sterownika do kart Matrox.
+
 %package driver-neomagic
 Summary:	NeoMagic video driver
 Summary(pl):	Sterownik do kart NeoMagic
@@ -1208,12 +1268,6 @@
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64
-# for dri
-Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
 Obsoletes:	XFree86-SiS
 Obsoletes:	XFree86-driver-sis
 
@@ -1223,6 +1277,24 @@
 %description driver-sis -l pl
 Sterownik do kart na układach SiS.
 
+%package driver-sis-dri
+Summary:	DRI modules for SiS video driver
+Summary(pl):	Moduły DRI dla sterownika do kart na układach SiS
+Group:		X11/Servers
+Requires:	%{name}-driver-sis = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64
+# for dri
+Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-sis-dri
+DRI modules for SiS video driver.
+
+%description driver-sis-dri -l pl
+Moduły DRI dla sterownika do kart na układach SiS.
+
 %package driver-sisusb
 Summary:	Video driver for SiS video chips connected via a Net2280-based USB dongle
 Summary(pl):	Sterownik obrazu dla układów SiS podłączonych poprzez przejściówkę USB Net2280
@@ -1349,14 +1421,6 @@
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 alpha arm ppc
-# for dri
-Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-# dlopens libglide3x.so
-Requires:	Glide3-DRI
-%endif
 Obsoletes:	XFree86-3dfx
 Obsoletes:	XFree86-driver-tdfx
 
@@ -1370,6 +1434,26 @@
 Sterownik DRI wymaga pakietu Glide_V3-DRI do kart Banshee lub Voodoo3,
 a Glide_V5-DRI do kart Voodoo4 lub Voodoo5.
 
+%package driver-tdfx-dri
+Summary:	DRI modules for 3Dfx video driver
+Summary(pl):	Moduły DRI dla sterownika do kart 3Dfx
+Group:		X11/Servers
+Requires:	%{name}-driver-tdfx = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 alpha arm ppc
+# for dri
+Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires:	%{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+# dlopens libglide3x.so
+Requires:	Glide3-DRI
+%endif
+
+%description driver-tdfx-dri
+DRI modules for 3Dfx video driver.
+
+%description driver-tdfx-dri -l pl
+Moduły DRI dla sterownika do kart 3Dfx.
+
 %package driver-tga
 Summary:	TGA video driver
 Summary(pl):	Sterownik do kart TGA
@@ -2126,7 +2210,7 @@
 install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
 install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
 install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
-install %{SOURCE13} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/XTerm.pl
+install %{SOURCE13} $RPM_BUILD_ROOT%{_appdefsdir}/pl/XTerm
 
 install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/xdm
 install %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/xfs
@@ -2281,6 +2365,7 @@
 %{_appdefsdir}/XLogo-color
 %{_appdefsdir}/XSm
 %{_appdefsdir}/XTerm
+%lang(pl) %{_appdefsdir}/pl/XTerm
 %{_appdefsdir}/XTerm-color
 
 %attr(755,root,root) %{_libx11dir}/lbxproxy
@@ -2772,10 +2857,12 @@
 %files driver-glint
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.so
+%{_mandir}/man4/glint.4*
+
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+#%files driver-glint-dri
 #%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
 %endif
-%{_mandir}/man4/glint.4*
 
 # Devel: sparc sparc64
 %ifarch %{ix86} ia64 %{x8664}
@@ -2806,11 +2893,13 @@
 %files driver-i810
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.so
+%{_mandir}/man4/i810.4*
+
+%files driver-i810-dri
 %ifarch %{ix86} ia64
 %attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
 %endif
 %attr(755,root,root) %{_libdir}/modules/dri/i915_dri.so
-%{_mandir}/man4/i810.4*
 %endif
 
 # Devel: %{ix86} sparc sparc64 ppc %{x8664}
@@ -2825,10 +2914,12 @@
 %files driver-mga
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.so
+%{_mandir}/man4/mga.4*
+
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+%files driver-mga-dri
 %attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
 %endif
-%{_mandir}/man4/mga.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2871,22 +2962,26 @@
 %files driver-r128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.so
+%{_mandir}/man4/r128.4*
+
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+%files driver-r128-dri
 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
 %endif
-%{_mandir}/man4/r128.4*
 
 %files driver-radeon
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.so
+%{_mandir}/man4/radeon.4*
+
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+%files driver-radeon-dri
 %attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
 %attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
 %if %{with r300}
 %attr(755,root,root) %{_libdir}/modules/dri/r300_dri.so
 %endif
 %endif
-%{_mandir}/man4/radeon.4*
 
 # Devel: sparc sparc64
 %ifarch %{ix86} ia64 %{x8664} alpha
@@ -2932,10 +3027,12 @@
 %files driver-sis
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.so
+%{_mandir}/man4/sis.4*
+
 %ifarch %{ix86} ia64
+%files driver-sis-dri
 %attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
 %endif
-%{_mandir}/man4/sis.4*
 %endif
 
 %files driver-sisusb
@@ -2998,10 +3095,12 @@
 %files driver-tdfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.so
+%{_mandir}/man4/tdfx.4*
+
 %ifarch %{ix86} ia64 alpha arm
+%files driver-tdfx-dri
 %attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
 %endif
-%{_mandir}/man4/tdfx.4*
 %endif
 
 # Devel: sparc sparc64
@@ -3474,6 +3573,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.199  2006/08/23 11:57:02  baggins
+- release 11.1
+- separated DRI stuff fro drivers to driver-*-dri subpackages
+- pl xterm resources are back but now containing translations only
+
 Revision 1.198  2006/08/21 11:07:33  arekm
 - fix for https://bugs.freedesktop.org/attachment.cgi?id=5478
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.198&r2=1.199&f=u

