#
%define _sver %(echo %{version} | tr -d .)
-%define _synaptics_ver 0.11.3p11
+%define _synaptics_ver 0.11.4
Summary: XFree86 Window System servers and basic programs
-Summary(de): Xfree86 Window-System-Server und grundlegende Programme
+Summary(de): XFree86 Window-System-Server und grundlegende Programme
Summary(es): Programas básicos y servidores para el sistema de ventanas XFree86
Summary(fr): Serveurs du système XFree86 et programmes de base
Summary(ja): XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.3.99.11
-Release: 0.3
+Version: 4.3.99.13
+Release: 0.2
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: 0aa6cbc6ee19d38f3ab916929f283ac7
+# Source0-md5: 908b6c8b7ba2d52e54565c2f728fdfff
#Source1: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz
#Source2: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz
Source3: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
#Source39: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
# http://w1.894.telia.com/~u89404340/touchpad/index.html
Source40: http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver}.tar.bz2
-# Source40-md5: 4dabd4c8ce8968eba6cde1dd6265c9c7
+# Source40-md5: c07ffb03e93aefebc0570fe638939e27
Source41: http://www.linux.org.uk/~alan/S3.zip
# Source41-md5: 8b754fc6bbded60b683563b945e384b0
+Source42: twm-xsession.desktop
+Source43: xcalc.desktop
+Source44: xload.desktop
+Source45: xmag.desktop
+Source46: xcalc.png
+Source47: xload.png
+Source48: xmag.png
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch22: %{name}-neomagic_swcursor.patch
Patch23: %{name}-mga-busmstr.patch
Patch24: %{name}-agpgart-load.patch
-Patch25: %{name}-symbols.patch
+
Patch26: %{name}-HasFreetype2.patch
Patch27: %{name}-config-s3.patch
Patch28: %{name}-sparc_pci_domains.patch
Patch46: %{name}-lock.patch
Patch47: %{name}-linux-version.patch
Patch48: %{name}-new-s3-nodebug.patch
-Patch49: %{name}-core_pointer.patch
+Patch49: %{name}-genauth.patch
URL: http://www.xfree86.org/
BuildRequires: %{_bindir}/perl
BuildRequires: bison
%endif
Requires: %{name}-libs = %{version}
Requires: xauth
+Requires: pam >= 0.77.3
ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: xpm-progs
%define _soundsdir /usr/share/sounds
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
+%define _xsessdir /usr/share/xsessions
# avoid Mesa dependency in XFree86-OpenGL-libs
# Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
Summary(pl): Wsparcie OpenGL dla systemu X11R6
Group: X11/Libraries
Requires: %{name}-libs = %{version}
+Requires: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-nvidia
%description OpenGL-core
%description OpenGL-core -l pl
Wsparcie OpenGL dla systemu X11R6.
+%package OpenGL-libGL
+Summary: OpenGL support for X11R6 - GL library
+Summary(pl): Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
+Group: X11/Libraries
+Requires: XFree86-OpenGL-core = %{version}
+Obsoletes: XFree86-driver-firegl
+Conflicts: OpenGL-core < 4.3.99.12
+
+%description OpenGL-libGL
+OpenGL support for X11R6 system - GL library.
+
+%description OpenGL-libGL -l pl
+Wsparcie OpenGL dla systemu X11R6 - biblioteka GL.
+
%package OpenGL-devel
Summary: OpenGL for X11R6 development
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
Group: X11/Development/Libraries
+Requires: OpenGL-devel-base
Requires: %{name}-OpenGL-libs = %{version}
Requires: %{name}-devel
-Requires: OpenGL-devel-base
Provides: OpenGL-devel
Obsoletes: Mesa-devel
Obsoletes: XFree86-OpenGL-doc
Summary: OpenGL for X11R6 development (only gl?.h)
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
Group: X11/Development/Libraries
+Requires: OpenGL-devel
Requires: %{name}-OpenGL-libs = %{version}
Requires: %{name}-devel
-Requires: OpenGL-devel
Provides: OpenGL-devel-base
%description OpenGL-devel-base
Group: X11/XFree86/Servers
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{version}-%{release}
-Requires: XFree86-fonts-base
+Requires: %{name}-fonts-base
%description Xnest
Xnest is an X Window System server which runs in an X window. Xnest is
PreReq: xprint-initrc
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{version}-%{release}
-Requires: XFree86-fonts-base
+Requires: %{name}-fonts-base
%description Xprt
Xprt provides an X server with the print extension and special DDX
Group: X11/XFree86/Servers
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{version}-%{release}
-Requires: XFree86-fonts-base
+Requires: %{name}-fonts-base
Requires: pam
-Obsoletes: XFree86-VGA16 XFree86-SVGA XFree86-Mono
+Obsoletes: XFree86-Mono
+Obsoletes: XFree86-SVGA
+Obsoletes: XFree86-VGA16
# obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx
-Obsoletes: XFree86-Sun XFree86-Sun24
+Obsoletes: XFree86-Sun
+Obsoletes: XFree86-Sun24
# still not supported in 4.2.0:
#Obsoletes: XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
# (and many drivers from XF86_SVGA server... and some from others)
-Obsoletes: XFree86-XF86Setup Xconfigurator
+Obsoletes: XFree86-XF86Setup
+Obsoletes: Xconfigurator
%description Xserver
Generally used X server which uses display hardware. It requires
Group: X11/XFree86/Servers
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{version}-%{release}
-Requires: XFree86-fonts-base
+Requires: %{name}-fonts-base
%description Xvfb
Xvfb (X Virtual Frame Buffer) is an X Window System server that is
Group: X11/XFree86
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Obsoletes: XFree86-ATI
+Obsoletes: XFree86-Mach32
+Obsoletes: XFree86-Mach64
%description driver-ati
ATI video driver.
Summary: ATI Rage 128 video driver
Summary(pl): Sterownik do kart ATI Rage 128
Group: X11/XFree86
+Requires: OpenGL
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Requires: OpenGL
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
Summary: ATI Radeon video driver
Summary(pl): Sterownik do kart ATI Radeon
Group: X11/XFree86
+Requires: OpenGL
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Requires: OpenGL
-Requires: XFree86-driver-ati
+Requires: %{name}-driver-ati
Conflicts: XFree86-driver-nvidia
%description driver-radeon
Group: X11/XFree86
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Obsoletes: XFree86-ATI
+Obsoletes: XFree86-Mach32
+Obsoletes: XFree86-Mach64
%description driver-ati.2
ATI video driver (ATI.2) from gatos (http://gatos.sourceforge.net/).
Summary: ATI Rage 128 video driver (ATI.2)
Summary(pl): Sterownik do kart ATI Rage 128 (ATI.2)
Group: X11/XFree86
+Requires: OpenGL
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Requires: OpenGL
-Requires: XFree86-driver-ati.2
+Requires: %{name}-driver-ati.2
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
Summary: ATI Radeon video driver (ATI.2)
Summary(pl): Sterownik do kart ATI Radeon (ATI.2)
Group: X11/XFree86
+Requires: OpenGL
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Requires: OpenGL
-Requires: XFree86-driver-ati.2
+Requires: %{name}-driver-ati.2
Conflicts: XFree86-driver-nvidia
%description driver-radeon.2
Summary: GLINT/Permedia video driver
Summary(pl): Sterownik do kart GLINT i Permedia
Group: X11/XFree86
+Requires: OpenGL
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Requires: OpenGL
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-3DLabs
Summary: Intel i810/i815/i830 video driver
Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830
Group: X11/XFree86
+Requires: OpenGL
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Requires: OpenGL
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-i810
Summary: Matrox video driver
Summary(pl): Sterownik do kart Matrox
Group: X11/XFree86
+Requires: OpenGL
Requires: %{name}-Xserver = %{version}-%{release}
Requires: %{name}-modules = %{version}-%{release}
-Requires: OpenGL
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-mga
Summary: 3Dfx video driver
Summary(pl): Sterownik do kart 3Dfx
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
Requires: Glide3-DRI
Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-3dfx
Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
Group: X11/XFree86
Requires: %{name} >= %{version}
-Requires: XFree86-libs = %{version}
+Requires: %{name}-libs = %{version}
Requires: man-config
Obsoletes: X11R6-contrib
Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
-Requires: XFree86-libs = %{version}
+Requires: %{name}-libs = %{version}
%description -n twm
Twm is a window manager for the X Window System. It provides
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
+Requires: %{name}-fonts-base
Requires: %{name}-libs = %{version}
-Requires: XFree86-fonts-base
Obsoletes: xfsft XFree86-xfs
%description -n xfs
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p0
+
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{X11/fs,pam.d,rc.d/init.d,security/console.apps,sysconfig} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{X11/fs,pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
$RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/{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%{_datadir}/{misc,xsessions} \
$RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}/mini} \
- $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
+ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
+ $RPM_BUILD_ROOT%{_xsessdir}
%{__make} -C xc install install.man \
DESTDIR="$RPM_BUILD_ROOT" \
install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
install %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} \
- %{SOURCE26} %{SOURCE27} \
+ %{SOURCE26} %{SOURCE27} %{SOURCE43} %{SOURCE44} %{SOURCE45} \
$RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
- %{SOURCE35} %{SOURCE36} %{SOURCE37} \
+ %{SOURCE35} %{SOURCE36} %{SOURCE37} %{SOURCE46} %{SOURCE47} \
+ %{SOURCE48} \
$RPM_BUILD_ROOT%{_pixmapsdir}
bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+# twm desktop file for gdm/kdm support
+install %{SOURCE42} $RPM_BUILD_ROOT%{_xsessdir}/twm.desktop
+
:> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
:> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
:> $RPM_BUILD_ROOT/etc/security/blacklist.xdm
%post OpenGL-core -p /sbin/ldconfig
%postun OpenGL-core -p /sbin/ldconfig
+%post OpenGL-libGL -p /sbin/ldconfig
+%postun OpenGL-libGL -p /sbin/ldconfig
+
%post OpenGL-libs -p /sbin/ldconfig
%postun OpenGL-libs -p /sbin/ldconfig
%files OpenGL-core
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/glxgears
-%attr(755,root,root) %{_libdir}/libGL.so.*.*
-%attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) /usr/lib/libGL.so*
%attr(755,root,root) %{_libdir}/modules/extensions/libglx.a
%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
%{_mandir}/man1/glxgears.1x*
+%files OpenGL-libGL
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libGL.so.*.*
+%attr(755,root,root) %{_libdir}/libGL.so
+%attr(755,root,root) /usr/lib/libGL.so*
+
%files OpenGL-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libGLU.so
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
%{_mandir}/man4/nv*
%endif
%files libs -f XFree86-libs.lang
%defattr(644,root,root,755)
+%dir %{_sysconfdir}/xdg
%dir %{_themesdir}
%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
%dir %{_sbindir}
%dir %{_datadir}/locale
%dir %{_datadir}/misc
+%dir %{_datadir}/xsessions
%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
%dir %{_soundsdir}
%{_libdir}/X11/app-defaults/Xditview-chrtr
%{_desktopdir}/oclock.desktop
+%{_desktopdir}/xcalc.desktop
%{_desktopdir}/xclipboard.desktop
%{_desktopdir}/xclock.desktop
%{_desktopdir}/xedit.desktop
%{_desktopdir}/xeyes.desktop
+%{_desktopdir}/xload.desktop
+%{_desktopdir}/xmag.desktop
%{_pixmapsdir}/oclock.png
+%{_pixmapsdir}/xcalc.png
%{_pixmapsdir}/xclipboard.png
%{_pixmapsdir}/xclock.png
%{_pixmapsdir}/xedit.png
%{_pixmapsdir}/xeyes.png
+%{_pixmapsdir}/xload.png
+%{_pixmapsdir}/xmag.png
%files -n imake
%defattr(644,root,root,755)
%files -n twm
%defattr(644,root,root,755)
%{_wmpropsdir}/twm.desktop
+%{_xsessdir}/twm.desktop
%attr(755,root,root) %{_bindir}/twm
%dir %{_sysconfdir}/X11/twm
%config %{_sysconfdir}/X11/twm/system.twmrc
projects / packages / XFree86.git / blobdiff