# TODO:
# - separate XFS to be standalone - is it possible without duplicated files?
+# - there should be imake and XFree86-devel BuildRequires but it's a little
+# strange idea. It's waiting for the right way execution (c) wrobell ;)
#
# Conditional build:
#
%define _sver %(echo %{version} | tr -d .)
-%define _synaptics_ver 0.11.8
+%define _synaptics_ver 0.12.1
Summary: XFree86 Window System servers and basic programs
Summary(de): XFree86 Window-System-Server und grundlegende Programme
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.3.99.15
-Release: 0.1
+Version: 4.3.99.901
+Release: 0.2
Epoch: 1
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: ae7ec191348888bc9f83318e55a009e1
+# Source0-md5: 110b2eb9ca59fc2794e6ab46ec5c86a8
#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/files/synaptics-%{_synaptics_ver}.tar.bz2
-# Source40-md5: 48c6e9abc68672d5167f1b699b89005e
+# Source40-md5: 7106431c76d363f11c3cc29d66c19b85
Source41: http://www.linux.org.uk/~alan/S3.zip
# Source41-md5: 8b754fc6bbded60b683563b945e384b0
Source42: twm-xsession.desktop
Source46: xcalc.png
Source47: xload.png
Source48: xmag.png
+Source49: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+# NoSource49-md5: bf9b05a66798796b53ed1a050049b2ee
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}-xterm-fix.patch
Patch26: %{name}-HasFreetype2.patch
Patch27: %{name}-config-s3.patch
Patch28: %{name}-sparc_pci_domains.patch
Patch48: %{name}-new-s3-nodebug.patch
Patch49: %{name}-mandir-fix.patch
Patch50: %{name}-xterm-256colors.patch
+Patch51: %{name}-new-s3-pScreen.patch
URL: http://www.xfree86.org/
BuildRequires: %{_bindir}/perl
+%ifarch %{ix86} alpha
+%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
+%endif
+# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
+%ifarch %{ix86}
+%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
+%endif
BuildRequires: bison
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.122
BuildRequires: tcl-devel
+BuildRequires: unzip
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-%ifarch %{ix86} alpha
-%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
-%endif
-# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86}
-%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
-%endif
Requires: %{name}-libs = %{epoch}:%{version}
Requires: xauth
Requires: pam >= 0.77.3
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
-%define _icondir /usr/share/icons
-%define _pixmapsdir /usr/share/pixmaps
%define _soundsdir /usr/share/sounds
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
+%define _appdefsdir %{_libdir}/X11/app-defaults
# avoid Mesa dependency in XFree86-OpenGL-libs
# Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib.
+%package -n XcursorTheme-handhelds
+Summary: Cursors Theme "handhelds"
+Summary(pl): Motyw kursorów "handhelds"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-handhelds
+Cursors theme "handhelds" for X11.
+
+%description -n XcursorTheme-handhelds -l pl
+Motyw kursorów "handhelds" dla X11.
+
+%package -n XcursorTheme-redglass
+Summary: Cursors theme "redglass"
+Summary(pl): Motyw kursorów "redglass"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-redglass
+Cursors theme "redglass" for X11.
+
+%description -n XcursorTheme-redglass -l pl
+Motyw kursorów "redglass" dla X11.
+
+%package -n XcursorTheme-whiteglass
+Summary: Cursors theme "whiteglass"
+Summary(pl): Motyw kursorów "whiteglass"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-whiteglass
+Cursors theme "whiteglass" for X11.
+
+%description -n XcursorTheme-whiteglass -l pl
+Motyw kursorów "whiteglass" dla X11.
+
%package -n imake
Summary: C preprocessor interface to the make utility
Summary(pl): Miedzymordzie do make oparte o preprocesor C
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
%patch48 -p0
%patch49 -p1
%patch50 -p1
+%patch51 -p1
rm -f xc/config/cf/host.def
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
+ ICONDIR="%{_iconsdir}" \
LINUXDIR="%{_kernelsrcdir}"
%ifnarch alpha
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
+ ICONDIR="%{_iconsdir}" \
LINUXDIR="%{_kernelsrcdir}"
cd $olddir
%endif
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
+ ICONDIR="%{_iconsdir}" \
LINUXDIR="%{_kernelsrcdir}"
cd synaptics
-for f in COMPATIBILITY FEATURES INSTALL NEWS PARAMETER; do
+for f in COMPATIBILITY INSTALL NEWS README README.alps TODO; do
cp -f ${f} ${f}.synaptics
done
%endif
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
- $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%{_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},%{_pixmapsdir}/mini} \
+ $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir}/mini,%{_pixmapsdir}/mini} \
$RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
$RPM_BUILD_ROOT%{_xsessdir}
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
+ ICONDIR="%{_iconsdir}" \
LINUXDIR="%{_kernelsrcdir}"
%ifnarch sparc sparc64
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so
+# get the most current OpenGL extensions
+rm -f $RPM_BUILD_ROOT%{_includedir}/GL/glext.h
+cp %{SOURCE49} $RPM_BUILD_ROOT%{_includedir}/GL/glext.h
+
# collect Xserver headers
install -d $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
cd xc/programs/Xserver
install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
-install %{SOURCE9} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
+install %{SOURCE9} $RPM_BUILD_ROOT%{_appdefsdir}/pl/XTerm
install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm
install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
# resolve conflict with man-pages
mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
-# fix mkfontscale path
-perl -pi -e "s#mkfontscale#%{_bindir}/mkfontscale#g" $RPM_BUILD_ROOT%{_bindir}/mkfontdir
-
# directories for applications locales
echo '%defattr(644,root,root,755)' > XFree86-libs.lang
for lang in af az bg bg_BG.cp1251 br ca cs da de el en_GB eo es et eu fi \
%doc %{_libdir}/X11/doc
%endif
-%{_libdir}/X11/app-defaults/UXTerm
-%{_libdir}/X11/app-defaults/XCalc
-%{_libdir}/X11/app-defaults/XCalc-color
-%{_libdir}/X11/app-defaults/XClipboard
-%{_libdir}/X11/app-defaults/XClock
-%{_libdir}/X11/app-defaults/XClock-color
-%{_libdir}/X11/app-defaults/XLoad
-%{_libdir}/X11/app-defaults/XLogo
-%{_libdir}/X11/app-defaults/XLogo-color
-%{_libdir}/X11/app-defaults/XSm
-%{_libdir}/X11/app-defaults/XTerm
-%lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm
-%{_libdir}/X11/app-defaults/XTerm-color
-%dir %{_icondir}
-%{_icondir}/*
+%{_appdefsdir}/UXTerm
+%{_appdefsdir}/XCalc
+%{_appdefsdir}/XCalc-color
+%{_appdefsdir}/XClipboard
+%{_appdefsdir}/XClock
+%{_appdefsdir}/XClock-color
+%{_appdefsdir}/XLoad
+%{_appdefsdir}/XLogo
+%{_appdefsdir}/XLogo-color
+%{_appdefsdir}/XSm
+%{_appdefsdir}/XTerm
+%lang(pl) %{_appdefsdir}/pl/XTerm
+%{_appdefsdir}/XTerm-color
%attr(755,root,root) %{_libdir}/X11/lbxproxy
%attr(755,root,root) %{_libdir}/X11/proxymngr
%{_pixmapsdir}/xlogo64.png
%{_pixmapsdir}/xterm.png
-%{_libdir}/X11/app-defaults/Xvidtune
+%{_appdefsdir}/Xvidtune
%{_mandir}/man1/Xmark.1*
%{_mandir}/man1/appres.1*
%attr(755,root,root) %{_bindir}/X
%{_mandir}/man1/XFree86.1*
%{_mandir}/man1/Xserver.1*
+%{_mandir}/man1/getconfig.1*
%{_mandir}/man5/XF86Config.5*
+%{_mandir}/man5/getconfig.5*
%{_libdir}/X11/Cards
%{_libdir}/X11/Options
+%{_libdir}/X11/getconfig
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/XF86Config
%attr(640,root,root) %config %verify(not md5 size mtime) /etc/pam.d/xserver
%dir %{_themesdir}/ThinIce
%{_libdir}/X11/XErrorDB
%{_libdir}/X11/XKeysymDB
-%dir %{_libdir}/X11/app-defaults
-%lang(cs) %dir %{_libdir}/X11/app-defaults/cs
-%lang(da) %dir %{_libdir}/X11/app-defaults/da
-%lang(de) %dir %{_libdir}/X11/app-defaults/de
-%lang(es) %dir %{_libdir}/X11/app-defaults/es
-%lang(fr) %dir %{_libdir}/X11/app-defaults/fr
-%lang(hu) %dir %{_libdir}/X11/app-defaults/hu
-%lang(ko) %dir %{_libdir}/X11/app-defaults/ko
-%lang(nl) %dir %{_libdir}/X11/app-defaults/nl
-%lang(pl) %dir %{_libdir}/X11/app-defaults/pl
-%lang(pt) %dir %{_libdir}/X11/app-defaults/pt
-%lang(ru) %dir %{_libdir}/X11/app-defaults/ru
-%lang(sk) %dir %{_libdir}/X11/app-defaults/sk
-%lang(zh_CN) %dir %{_libdir}/X11/app-defaults/zh_CN.gb2312
-%lang(zh_TW) %dir %{_libdir}/X11/app-defaults/zh_TW.big5
+%dir %{_appdefsdir}
+%lang(cs) %dir %{_appdefsdir}/cs
+%lang(da) %dir %{_appdefsdir}/da
+%lang(de) %dir %{_appdefsdir}/de
+%lang(es) %dir %{_appdefsdir}/es
+%lang(fr) %dir %{_appdefsdir}/fr
+%lang(hu) %dir %{_appdefsdir}/hu
+%lang(ko) %dir %{_appdefsdir}/ko
+%lang(nl) %dir %{_appdefsdir}/nl
+%lang(pl) %dir %{_appdefsdir}/pl
+%lang(pt) %dir %{_appdefsdir}/pt
+%lang(ru) %dir %{_appdefsdir}/ru
+%lang(sk) %dir %{_appdefsdir}/sk
+%lang(zh_CN) %dir %{_appdefsdir}/zh_CN.gb2312
+%lang(zh_TW) %dir %{_appdefsdir}/zh_TW.big5
%{_libdir}/X11/locale
%dir %{_includedir}
%dir %{_includedir}/X11
%dir %{_sbindir}
%dir %{_datadir}/locale
%dir %{_datadir}/misc
+%dir %{_iconsdir}
+%dir %{_iconsdir}/mini
%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
%dir %{_soundsdir}
%endif
%attr(755,root,root) %{_bindir}/xf86cfg
%attr(755,root,root) %{_bindir}/xf86config
-%{_libdir}/X11/app-defaults/XF86Cfg
+%{_appdefsdir}/XF86Cfg
%ifnarch ppc
%{_mandir}/man1/scanpci.1*
%endif
%lang(pl) %{_mandir}/pl/man1/rman.1*
-%{_libdir}/X11/app-defaults/Beforelight
-%{_libdir}/X11/app-defaults/Bitmap
-%{_libdir}/X11/app-defaults/Bitmap-color
-%{_libdir}/X11/app-defaults/Clock-color
-%{_libdir}/X11/app-defaults/Editres
-%{_libdir}/X11/app-defaults/Editres-color
-%{_libdir}/X11/app-defaults/Viewres
-%{_libdir}/X11/app-defaults/XConsole
-%{_libdir}/X11/app-defaults/Xedit
-%{_libdir}/X11/app-defaults/Xedit-color
-%{_libdir}/X11/app-defaults/Xfd
-%{_libdir}/X11/app-defaults/Xgc
-%{_libdir}/X11/app-defaults/Xmag
-%{_libdir}/X11/app-defaults/Xman
-%{_libdir}/X11/app-defaults/Xmessage
-%{_libdir}/X11/app-defaults/Xmessage-color
-%{_libdir}/X11/app-defaults/Xmh
-%{_libdir}/X11/app-defaults/XFontSel
-%{_libdir}/X11/app-defaults/Xditview
-%{_libdir}/X11/app-defaults/Xditview-chrtr
+%{_appdefsdir}/Beforelight
+%{_appdefsdir}/Bitmap
+%{_appdefsdir}/Bitmap-color
+%{_appdefsdir}/Clock-color
+%{_appdefsdir}/Editres
+%{_appdefsdir}/Editres-color
+%{_appdefsdir}/Viewres
+%{_appdefsdir}/XConsole
+%{_appdefsdir}/Xedit
+%{_appdefsdir}/Xedit-color
+%{_appdefsdir}/Xfd
+%{_appdefsdir}/Xgc
+%{_appdefsdir}/Xmag
+%{_appdefsdir}/Xman
+%{_appdefsdir}/Xmessage
+%{_appdefsdir}/Xmessage-color
+%{_appdefsdir}/Xmh
+%{_appdefsdir}/XFontSel
+%{_appdefsdir}/Xditview
+%{_appdefsdir}/Xditview-chrtr
%{_desktopdir}/oclock.desktop
%{_desktopdir}/xcalc.desktop
%{_pixmapsdir}/xload.png
%{_pixmapsdir}/xmag.png
+%files -n XcursorTheme-handhelds
+%defattr(644,root,root,755)
+%{_iconsdir}/handhelds
+
+%files -n XcursorTheme-redglass
+%defattr(644,root,root,755)
+%{_iconsdir}/redglass
+
+%files -n XcursorTheme-whiteglass
+%defattr(644,root,root,755)
+%{_iconsdir}/whiteglass
+
%files -n imake
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ccmakedep
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm
/var/lib/xdm
-%{_libdir}/X11/app-defaults/Chooser
+%{_appdefsdir}/Chooser
%attr(755,root,root) %{_libdir}/X11/xdm
%attr(755,root,root) %{_bindir}/xdm
%attr(755,root,root) %{_bindir}/chooser
-%ifarch alpha
-%attr(755,root,root) %{_libdir}/libXdmGreet.so*
-%endif
%{_mandir}/man1/xdm.1*
%dir /etc/X11/xdm