- back previous change

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index adfb18f7afb3617b8cdd1256b88e6a5ddb50609a..ecde6a82d8c19343b5c1c6586d0c7e6b580985c1 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -7,7 +7,6 @@
 # - -Xprint seem to be Xprt configuration files - if they aren't used by
 #   some (possibly remote) X client, merge them into -Xprt
 # - where to take dtpdmd from?
-# - http://security.gentoo.org/glsa/glsa-200509-07.xml
 #
 # Conditional build:
 %bcond_without glide           # don't build glide driver
@@ -28,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          X11
 Version:       6.9.0
-Release:       5
+Release:       13
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -78,6 +77,7 @@ Source52:     xmag.png
 Source53:      http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
 Source54:      XvMCConfig
 # NoSource53-md5:      0c40bd4545aa630e139043c2b12f0807
+Patch0:                http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-geteuid.diff
 Patch1:                %{name}-PLD.patch
 Patch2:                %{name}-enableglide.patch
 Patch3:                %{name}-DisableDebug.patch
@@ -97,7 +97,7 @@ Patch16:      %{name}-mga-busmstr.patch
 Patch17:       %{name}-agpgart-load.patch
 Patch18:       %{name}-XTerm.ad.patch
 Patch19:       %{name}-llh.patch
-Patch20:       XFree86-xman-manpaths.patch
+Patch20:       %{name}-xman-manpaths.patch
 Patch21:       %{name}-clearrts.patch
 Patch22:       XFree86-Xfont-Type1-large-DoS.patch
 Patch23:       %{name}-GLcore-strip-a-workaround.patch
@@ -112,12 +112,13 @@ Patch30:  %{name}-acpi_event_loop_fix.patch
 Patch31:       %{name}-i810fb.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4320
 Patch32:       %{name}-compositefastpath.patch
+Patch33:       ftp://ftp.x.org/pub/X11R6.9.0/patches/x11r6.9.0-mitri.diff
+Patch34:       %{name}-intel.patch
 Patch50:       %{name}-glibc-locale_sync.patch
 Patch60:       %{name}-oldkeyb.patch
 Patch61:       %{name}-sparc64-asmfix.patch
 Patch62:       %{name}-sparc64-v9fix.patch
 Patch63:       %{name}-pci-build.patch
-Patch64:       %{name}-xkbcomp-level.patch
 # XFree86-tdfx-fix-vtswitch-font-corruption.patch - issue still not fixed,
 # but patch doesn't help either; however, it occurs in text mode only, not
 # with tdfxfb, which is worth using anyway
@@ -818,12 +819,6 @@ Summary(pl):       Sterownik do kart ATI Rage 128
 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-Rage128
 Obsoletes:     XFree86-driver-r128
 
@@ -833,6 +828,24 @@ 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
+
+%description driver-r128-dri
+DRI modules for ATI Rage 128 video driver.
+
+%description driver-r128-dri -l pl
+Modu³y DRI dla sterownika do kart ATI Rage 128.
+
 %package driver-radeon
 Summary:       ATI Radeon video driver
 Summary(pl):   Sterownik do kart ATI Radeon
@@ -840,19 +853,31 @@ Group:            X11/Servers
 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
@@ -950,12 +975,6 @@ Summary(pl):       Sterownik do kart GLINT i Permedia
 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
 
@@ -965,6 +984,24 @@ GLINT/Permedia video driver.
 %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
@@ -1014,12 +1051,6 @@ Summary(pl):     Sterownik do grafiki na uk
 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
 
@@ -1029,6 +1060,24 @@ Intel i810/i815/i830 video driver.
 %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
@@ -1049,12 +1098,6 @@ Summary(pl):     Sterownik do kart Matrox
 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
 
@@ -1064,6 +1107,24 @@ Matrox video driver.
 %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
@@ -1206,12 +1267,6 @@ Summary(pl):     Sterownik do kart na uk
 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
 
@@ -1221,6 +1276,24 @@ SiS video driver.
 %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
@@ -1347,14 +1420,6 @@ Summary(pl):     Sterownik do kart 3Dfx
 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
 
@@ -1368,6 +1433,26 @@ Sterownik do kart 3Dfx: Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5.
 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
@@ -1455,6 +1540,7 @@ Summary(ru):      
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
 Group:         X11/Libraries
 Requires(post,postun): /sbin/ldconfig
+Requires(triggerpostun):       sed >= 4.0
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      glibc >= 6:2.3.5-7.6
 Provides:      XFree86-libs = %{epoch}:%{version}-%{release}
@@ -1958,6 +2044,11 @@ X11-libs.
 
 %prep
 %setup -qc -a1 -a2 -a7
+cd xc
+%patch0 -p0
+%patch33 -p0
+cd ..
+%patch34 -p1
 %patch1 -p1
 %{?with_glide:%patch2 -p0}
 %patch3 -p0
@@ -1993,14 +2084,12 @@ rm -f xc/config/cf/host.def
 %patch30 -p0
 %patch31 -p0
 %patch32 -p0
-# ankry, FIXME :)
-# %patch50 -p1
+%patch50 -p1
 %patch60 -p0
 # FIXME
 # %patch61 -p1
 %patch62 -p1
 %patch63 -p1
-%patch64 -p1
 
 # FIXME, is this still needed?
 # %patch69 -p0
@@ -2767,10 +2856,12 @@ fi
 %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}
@@ -2801,11 +2892,13 @@ fi
 %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}
@@ -2820,10 +2913,12 @@ fi
 %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
@@ -2866,22 +2961,26 @@ fi
 %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
@@ -2927,10 +3026,12 @@ fi
 %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
@@ -2993,10 +3094,12 @@ fi
 %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