#
# TODO:
# - separate XFS to be standalone - is it possible without duplicated files?
-# - unpacked files
+# - unpackaged files
#
# Conditional build:
%bcond_without glide # don't build glide driver
Summary(uk.UTF-8): Базові шрифти, програми та документація для робочої станції під X
Summary(zh_CN.UTF-8): XFree86 窗口系统服务器和基本程序
Name: XFree86
-Version: 4.6.0
-Release: 0.2
+Version: 4.7.0
+Release: 0.1
Epoch: 1
License: XFree86 1.1
Group: X11
-Source0: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-1.tgz
-# Source0-md5: 6c05f3486f088d01584f4517540e8d18
-Source1: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-2.tgz
-# Source1-md5: f084d12aa734c9cd83e8d2a3a4eb3e32
-Source2: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-3.tgz
-# Source2-md5: 05450997f1876098d791a4cf9db21af8
+Source0: ftp://ftp.xfree86.org/pub/XFree86/4.7.0/source/%{name}-%{version}-src-1.tgz
+# Source0-md5: e452e53240d16091abdc4f4bd2967ebd
+Source1: ftp://ftp.xfree86.org/pub/XFree86/4.7.0/source/%{name}-%{version}-src-2.tgz
+# Source1-md5: db68bab296cff797c1ae399f683905f2
+Source2: ftp://ftp.xfree86.org/pub/XFree86/4.7.0/source/%{name}-%{version}-src-3.tgz
+# Source2-md5: 4787c740ee8ae61a294f488606ced230
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source8: xdm.pamd
Source50: xcalc.png
Source51: xload.png
Source52: xmag.png
-Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: 0c40bd4545aa630e139043c2b12f0807
+Source53: http://www.opengl.org/registry/api/glext.h
+# NoSource53-md5: 2e0c1c691b518b06691eba826a97cf3b
Source54: %{name}-xrender.pc
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch22: %{name}-neomagic_swcursor.patch
Patch23: %{name}-mga-busmstr.patch
Patch24: %{name}-agpgart-load.patch
-# ftp://ftp.xfree86.org/pub/XFree86/4.6.0/fixes/fix-01 (CVE-2006-3739, CVE-2006-3740)
-Patch25: %{name}-fix-01.patch
+
Patch26: %{name}-HasFreetype2.patch
Patch28: %{name}-sparc_pci_domains.patch
Patch29: %{name}-XTerm.ad.patch
# Small (maybe buggy) patch to resolve problems with totem 0.97.0
Patch46: %{name}-lock.patch
Patch47: %{name}-sparc-kbd.patch
-Patch48: %{name}-freetype-nointernals.patch
+
Patch50: %{name}-xterm-256colors.patch
Patch52: %{name}-kernel_headers.patch
Patch53: %{name}-stdint.patch
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
-%define _soundsdir /usr/share/sounds
%define _themesdir /usr/share/themes
-%define _wallpapersdir /usr/share/wallpapers
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
-%define _wmstylesdir /etc/sysconfig/wmstyles
%define _libx11dir %{_prefix}/lib/X11
%define _appdefsdir %{_libx11dir}/app-defaults
Summary(pl.UTF-8): Biblioteki OpenGL dla systemu X11R6
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Provides: OpenGL = 1.4
+Provides: OpenGL = 1.5
Provides: OpenGL-GLU = 1.3
Provides: OpenGL-GLX = 1.4
Obsoletes: Mesa
Requires: OpenGL-devel-base
Provides: OpenGL-GLU-devel = 1.3
Provides: OpenGL-GLX-devel = 1.4
-Provides: OpenGL-devel = 1.4
+Provides: OpenGL-devel = 1.5
Obsoletes: Mesa-devel
Obsoletes: XFree86-OpenGL-doc
Obsoletes: glxMesa-devel
%description OpenGL-static -l pl.UTF-8
Biblioteki statyczne zawierające wsparcie dla OpenGL do X11R6.
+%package Xdmx
+Summary: XFree86 Xdmx server
+Summary(pl.UTF-8): Serwer XFree86 Xdmx
+Group: X11/Servers
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+
+%description Xdmx
+Xdmx - distributed multi-head X server.
+
+%description Xdmx -l pl.UTF-8
+Xdmx - rozproszony, wielomonitorowy serwer X.
+
%package Xnest
Summary: XFree86 Xnest server
Summary(pl.UTF-8): Serwer XFree86 Xnest
Якщо вам потрібно тестувати ваші X-сервери або X-клієнти, ви можете
встановити для цієї цілі Xvfb.
+%package kdrive
+Summary: Tiny X server (kdrive)
+Summary(pl.UTF-8): Mały serwer X (TinyX/kdrive)
+Group: X11/Servers
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
+Requires: XFree86-fonts-base
+
+%description kdrive
+TinyX (also known as kdrive) is a family of X servers designed to be
+particularly small.
+
+%description kdrive -l pl.UTF-8
+TinyX (znany także jako kdrive) to rodzina serwerów X zaprojektowanych
+tak, by były szczególnie małe.
+
%package devel
Summary: X11R6 headers and programming man pages
Summary(de.UTF-8): X11R6 Headers und man pages für Programmierer
%description driver-ark -l pl.UTF-8
Sterownik do kart Ark Logic.
+%package driver-aspeed
+Summary: ASPEED video driver
+Summary(pl.UTF-8): Sterownik do kart ASPEED
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-aspeed
+ASPEED driver. It supports AST2000 chip.
+
+%description driver-aspeed -l pl.UTF-8
+Sterownik do kart ASPEED. Obsługuje układy AST2000.
+
%package driver-ati
Summary: ATI video driver
Summary(pl.UTF-8): Sterownik do kart ATI
%description driver-ati -l pl.UTF-8
Sterownik do kart ATI.
-%package driver-r128
-Summary: ATI Rage 128 video driver
-Summary(pl.UTF-8): 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
-
-%description driver-r128
-ATI Rage 128 video driver.
-
-%description driver-r128 -l pl.UTF-8
-Sterownik do kart ATI Rage 128.
-
-%package driver-radeon
-Summary: ATI Radeon video driver
-Summary(pl.UTF-8): Sterownik do kart ATI Radeon
-Group: X11/Servers
-Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires: %{name}-driver-ati = %{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
-
-%description driver-radeon
-ATI Radeon video driver.
-
-%description driver-radeon -l pl.UTF-8
-Sterownik do kart ATI Radeon.
-
%package driver-chips
Summary: Chips and Technologies video driver
Summary(pl.UTF-8): Sterownik do kart na układach Chips and Technologies
%description driver-nv -l pl.UTF-8
Sterownik do kart na układach firmy nVidia: Riva128, RivaTNT, GeForce.
+%package driver-pnozz
+Summary: Weitek POWER 9100 video driver
+Summary(pl.UTF-8): Sterownik do karty Weitek POWER 9100
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-pnozz
+Weitek POWER 9100 video driver, for SBus adapter which can be found
+in some SPARC laptops.
+
+%description driver-pnozz -l pl.UTF-8
+Sterownik do karty SBuusWeitek POWER 9100, spotykanej w niektórych
+laptopach z procesorem SPARC.
+
+%package driver-r128
+Summary: ATI Rage 128 video driver
+Summary(pl.UTF-8): 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
+
+%description driver-r128
+ATI Rage 128 video driver.
+
+%description driver-r128 -l pl.UTF-8
+Sterownik do kart ATI Rage 128.
+
+%package driver-radeon
+Summary: ATI Radeon video driver
+Summary(pl.UTF-8): Sterownik do kart ATI Radeon
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-driver-ati = %{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
+
+%description driver-radeon
+ATI Radeon video driver.
+
+%description driver-radeon -l pl.UTF-8
+Sterownik do kart ATI Radeon.
+
%package driver-rendition
Summary: Rendition video driver
Summary(pl.UTF-8): Sterownik do kart Rendition
Sterownik do emulacji karty SVGA dostępnej pod VMware. Przydatny,
jeśli uruchamiasz Linuksa na wirtualnej maszynie VMware.
+%package driver-xgi
+Summary: XGI (Xabre Graphics Inc.) driver
+Summary(pl.UTF-8): Sterownik do kart XGI (Xabre Graphics Inc.)
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-xgi
+XGI (Xabre Graphics Inc.) driver. It supports Volari V3XT/V5/V8 and
+Volari Z7 chipsets.
+
+%description driver-xgi -l pl.UTF-8
+Sterownik do kart XGI (Xabre Graphics Inc.). Obsługuje układy Volari
+V3XT/V5/V8 i Volari Z7.
+
%package libs
Summary: X11R6 shared libraries
Summary(de.UTF-8): X11R6 shared Libraries
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p0
%patch26 -p1
%ifarch sparc sparc64
#%patch28 -p1 -- needs update
%patch45 -p1
%patch46 -p0
%patch47 -p1
-%patch48 -p1
%patch50 -p0
%patch52 -p1
%patch53 -p0
%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%{_sbindir} \
$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,Bluecurve}} \
- $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
+ $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
+ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial,Bluecurve}} \
+ $RPM_BUILD_ROOT%{_xsessdir} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
%{__make} -C xc install install.man \
cp -f %{SOURCE53} $RPM_BUILD_ROOT/usr/include/GL/glext.h
# don't include shared version due to Motif issues
-rm -f $RPM_BUILD_ROOT%{_libdir}/libGLw.so*
+#rm -f $RPM_BUILD_ROOT%{_libdir}/libGLw.so*
# collect Xserver headers and make symlinks
for f in `cat %{SOURCE44}`; do
# kill some stuff for cleaner build (DRM already in kernel)
rm -rf $RPM_BUILD_ROOT%{_prefix}/src
+# dmx examples
+rm -f $RPM_BUILD_ROOT%{_bindir}/{evi,res,xbell,xinput,xled,xtest}
+
%clean
rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/glxgears
%attr(755,root,root) %{_libdir}/libGLU.so.*.*
# to be fixed: it contains unresolved symbols and would need -lXm
-#%attr(755,root,root) %{_libdir}/libGLw.so.*.*
+%attr(755,root,root) %{_libdir}/libGLw.so.*.*
%attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
# Linux OpenGL ABI compatibility symlink
%attr(755,root,root) /usr/%{_lib}/libGLU.so.1
%{_libdir}/libGLU.a
%{_libdir}/libOSMesa.a
+%files Xdmx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xdmx
+%attr(755,root,root) %{_bindir}/dmxaddinput
+%attr(755,root,root) %{_bindir}/dmxaddscreen
+%attr(755,root,root) %{_bindir}/dmxreconfig
+%attr(755,root,root) %{_bindir}/dmxresize
+%attr(755,root,root) %{_bindir}/dmxrminput
+%attr(755,root,root) %{_bindir}/dmxrmscreen
+%attr(755,root,root) %{_bindir}/dmxtodmx
+%attr(755,root,root) %{_bindir}/dmxwininfo
+%attr(755,root,root) %{_bindir}/vdltodmx
+%attr(755,root,root) %{_bindir}/xdmx
+%attr(755,root,root) %{_bindir}/xdmxconfig
+%{_mandir}/man1/Xdmx.1x*
+%{_mandir}/man1/dmxtodmx.1x*
+%{_mandir}/man1/vdltodmx.1x*
+%{_mandir}/man1/xdmxconfig.1x*
+
%files Xnest
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Xnest
%attr(755,root,root) %{_bindir}/Xvfb
%{_mandir}/man1/Xvfb.1*
+%files kdrive
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xchips
+%attr(755,root,root) %{_bindir}/Xfbdev
+%attr(755,root,root) %{_bindir}/Xi810
+%attr(755,root,root) %{_bindir}/Xigs
+%attr(755,root,root) %{_bindir}/Xipaq
+%attr(755,root,root) %{_bindir}/Xmach64
+%attr(755,root,root) %{_bindir}/Xsavage
+%attr(755,root,root) %{_bindir}/Xsis530
+%attr(755,root,root) %{_bindir}/Xtrident
+%attr(755,root,root) %{_bindir}/Xtrio
+%attr(755,root,root) %{_bindir}/Xts300
+%attr(755,root,root) %{_bindir}/Xvesa
+%{_mandir}/man1/TinyX.1x*
+%{_mandir}/man1/Xchips.1x*
+%{_mandir}/man1/Xfbdev.1x*
+%{_mandir}/man1/Xi810.1x*
+%{_mandir}/man1/Xigs.1x*
+%{_mandir}/man1/Xipaq.1x*
+%{_mandir}/man1/Xkdrive.1x*
+%{_mandir}/man1/Xmach64.1x*
+%{_mandir}/man1/Xsavage.1x*
+%{_mandir}/man1/Xsis530.1x*
+%{_mandir}/man1/Xtrident.1x*
+%{_mandir}/man1/Xtrio.1x*
+%{_mandir}/man1/Xts300.1x*
+%{_mandir}/man1/Xvesa.1x*
+%{_mandir}/man1/kdrive.1x*
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
%attr(755,root,root) %{_bindir}/mmapw
%attr(755,root,root) %{_bindir}/xcursor-config
%attr(755,root,root) %{_bindir}/xft-config
+%attr(755,root,root) %{_libdir}/libAppleWM.so
%attr(755,root,root) %{_libdir}/libFS.so
%attr(755,root,root) %{_libdir}/libI810XvMC.so
%attr(755,root,root) %{_libdir}/libICE.so
%attr(755,root,root) %{_libdir}/libXxf86misc.so
%attr(755,root,root) %{_libdir}/libXxf86rush.so
%attr(755,root,root) %{_libdir}/libXxf86vm.so
+%attr(755,root,root) %{_libdir}/libdmx.so
%attr(755,root,root) %{_libdir}/libfontenc.so
%attr(755,root,root) %{_libdir}/libxkbfile.so
%attr(755,root,root) %{_libdir}/libxkbui.so
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
+# Devel: sparc sparc64
+%ifarch %{ix86} ia64 %{x8664}
+%files driver-aspeed
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/aspeed_drv.o
+%endif
+
+%files driver-ati
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-chips
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
# i810_dri alone is built on x86_64 - what for?
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
-#%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
+%attr(755,root,root) %{_libdir}/modules/dri/i915_dri.so
%{_mandir}/man4/i810.4*
%endif
%{_mandir}/man4/nv.4*
%endif
-%files driver-ati
+%ifarch sparc sparc64
+%files driver-pnozz
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/pnozz_drv.o
+%{_mandir}/man4/pnozz.4*
+%endif
%files driver-r128
%defattr(644,root,root,755)
%{_mandir}/man4/vmware.4*
%endif
+%ifarch %{ix86} ia64 %{x8664}
+%files driver-xgi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/xgi_drv.o
+%{_mandir}/man4/xgi.4*
+%endif
+
%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}/libAppleWM.so.*.*
%attr(755,root,root) %{_libdir}/libFS.so.*.*
%attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*
%attr(755,root,root) %{_libdir}/libICE.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86misc.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86rush.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86vm.so.*.*
+%attr(755,root,root) %{_libdir}/libdmx.so.*.*
%attr(755,root,root) %{_libdir}/libfontenc.so.*.*
%attr(755,root,root) %{_libdir}/libxkbfile.so.*.*
%attr(755,root,root) %{_libdir}/libxkbui.so.*.*
%{_mandir}/man4/dmc.4*
%{_mandir}/man4/dynapro.4*
%{_mandir}/man4/elographics.4*
+%{_mandir}/man4/eloinput.4*
%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man4/fpit.4*
%{_mandir}/man4/js_x.4*
%{_mandir}/man4/kbd.4*
%{_mandir}/man4/keyboard.4*
+%{_mandir}/man4/magictouch.4*
%{_mandir}/man4/microtouch.4*
%{_mandir}/man4/mouse-x.4*
%{_mandir}/man4/mutouch.4*
%files static
%defattr(644,root,root,755)
+%{_libdir}/libAppleWM.a
%{_libdir}/libFS.a
%{_libdir}/libI810XvMC.a
%{_libdir}/libICE.a
%{_libdir}/libXxf86misc.a
%{_libdir}/libXxf86rush.a
%{_libdir}/libXxf86vm.a
+%{_libdir}/libdmx.a
%{_libdir}/libfontenc.a
%{_libdir}/libxkbfile.a
%{_libdir}/libxkbui.a
projects / packages / XFree86.git / blobdiff