Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: X11
Version: 6.9.0
-Release: 10
+Release: 18
Epoch: 1
License: MIT/X Consortium/BSD (see README)
Group: X11
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
# 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
+Patch35: http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-cidfonts.diff
+Patch36: %{name}-i810_945GM.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
+# from http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-setuid.diff, but existing chunks removed.
+Patch64: x11r6.9.0-setuid.diff
# 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
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-xauth = %{epoch}:%{version}-%{release}
Requires: pam >= 0.79.0
+Requires: filesystem >= 2.0-1
Provides: XFree86 = %{epoch}:%{version}-%{release}
Obsoletes: XFree86
Obsoletes: xpm-progs
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
-%define _soundsdir /usr/share/sounds
-%define _wallpapersdir /usr/share/wallpapers
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
-%define _wmstylesdir /etc/sysconfig/wmstyle
%define _libx11dir %{_prefix}/lib/X11
%define _appdefsdir %{_libx11dir}/app-defaults
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
%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
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
%description driver-fbdev -l pl
Nieakcelerowany sterownik korzystaj±cy z framebuffera.
-%package driver-ffb
-Summary: Video driver for DRI sparc framebuffer device
-Summary(pl): Sterownik do framebuffera DRI na sparc
-Group: X11/Servers
-Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-driver-ffb
-
-%description driver-ffb
-Video driver for DRI sparc framebuffer device.
-
-%description driver-ffb -l pl
-Sterownik do framebuffera DRI na sparc.
-
%package driver-glide
Summary: 3Dfx Voodoo1 and Voodoo2 video driver
Summary(pl): Sterownik do kart 3Dfx Voodoo1 i Voodoo2
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
%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
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
%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
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
%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
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
%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
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
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
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: filesystem >= 2.0-1
Provides: twm = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-twm
Obsoletes: twm
Obsoletes: entrance
Obsoletes: gdm
Obsoletes: kdm
+Obsoletes: slim
Obsoletes: wdm
Obsoletes: xdm
%setup -qc -a1 -a2 -a7
cd xc
%patch0 -p0
+%patch64 -p1
%patch33 -p0
+%patch35 -p0
cd ..
+%patch34 -p1
%patch1 -p1
%{?with_glide:%patch2 -p0}
%patch3 -p0
%patch30 -p0
%patch31 -p0
%patch32 -p0
+%patch36 -p0
%patch50 -p1
%patch60 -p0
# FIXME
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
$RPM_BUILD_ROOT%{_appdefsdir}/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
$RPM_BUILD_ROOT%{_datadir}/misc \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
- $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial}} \
- $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
+ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_themesdir}/{ThinIce,Metal,Industrial}} \
+ $RPM_BUILD_ROOT%{_xsessdir} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
PWD=`pwd`
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
+install %{SOURCE13} $RPM_BUILD_ROOT%{_appdefsdir}/pl/XTerm
install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/xdm
install %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/xfs
%{_appdefsdir}/XLogo-color
%{_appdefsdir}/XSm
%{_appdefsdir}/XTerm
+%lang(pl) %{_appdefsdir}/pl/XTerm
%{_appdefsdir}/XTerm-color
%attr(755,root,root) %{_libx11dir}/lbxproxy
%attr(755,root,root) %{_libx11dir}/xinit
%attr(755,root,root) %{_libx11dir}/xsm
-%dir /etc/X11/xinit
%dir /etc/X11/lbxproxy
/etc/X11/lbxproxy/*
%dir /etc/X11/proxymngr
%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}
%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}
%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
%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
%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
%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
%files libs
%defattr(644,root,root,755)
/etc/ld.so.conf.d/*.conf
-%dir %{_sysconfdir}/xdg
-%dir %{_themesdir}
-%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
%dir %{_themesdir}/Metal
%dir %{_themesdir}/Industrial
/usr/include/X11
%dir %{_sbindir}
%dir %{_datadir}/misc
-%dir %{_iconsdir}
-%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
-%dir %{_soundsdir}
-%dir %{_wallpapersdir}
-%dir %{_wmpropsdir}
-%dir %{_xsessdir}
-%dir %{_wmstylesdir}
%attr(755,root,root) %{_libdir}/libFS.so.*.*
%attr(755,root,root) %{_libdir}/lib*XvMC*.so.*.*
%attr(755,root,root) %{_libdir}/libICE.so.*.*
projects / packages / X11.git / blobdiff