#
%define _sver %(echo %{version} | tr -d .)
+%define _synaptics_ver 0.11.3p2
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.4
-Release: 0.1
+Version: 4.3.99.6
+Release: 1
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
+# Source0-md5: 1aba2fcb679201305a3b710efeb27de9
#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.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
+Source3: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
+# Source3-md5: 0a15b1c374256b5cad7961807baa3896
Source4: xdm.pamd
Source5: xserver.pamd
Source6: xdm.init
Source36: oclock.png
Source37: xconsole.png
Source38: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
-Source39: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+# Source38-md5: a184106bb83cb27c6963944d9243ac3f
+#Source39: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+# Source39-md5: 8d43c01d364576c195a5294279f92566
+# http://w1.894.telia.com/~u89404340/touchpad/index.html
+Source40: http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver}.tar.bz2
+# Source40-md5: 2898f128f1e40dd29f3af38ce7550aae
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch46: %{name}-spencode-nowarning.patch
# Small (maybe buggy) patch to resolve problems with totem 0.97.0
Patch47: %{name}-lock.patch
-Patch48: %{name}-savage-20030505.patch
+#Patch48: %{name}-savage-20030505.patch
+URL: http://www.xfree86.org/
BuildRequires: bison
BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
-BuildRequires: gcc-c++
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
%description
-If you want to install the X Window System (TM) on your machine,
-you'll need to install XFree86.
-
The X Window System provides the base technology for developing
graphical user interfaces. Simply stated, X draws the elements of the
GUI on the user's screen and builds methods for sending user
Ten pakiet zawiera biblioteki statyczne.
+%package render
+Summary: X Render Extension
+Summary(pl): Rozszerzenie X Render
+Group: X11/Development/Libraries
+Requires: XFree86-devel
+
+%description render
+This package contains header files and documentation for the X render
+extension. Library and server implementations are separate.
+
+%description render -l pl
+Pakiet zawiera pliki nag³ówkowe i dokumenetacjê dla rozszerzenia
+X render. Biblioteka i implementacja serwera znajduj± siê w osobnym
+pakiecie.
+
+%package xrender
+Summary: X Render Extension
+Summary(pl): Rozszerzenie X Render
+Group: X11/Libraries
+Requires: %{name}-libs = %{version}
+
+%description xrender
+X render library.
+
+%description xrender -l pl
+Biblioteka X render.
+
+%package xrender-devel
+Summary: X Render Extension headers
+Summary(pl): Pliki nag³ówkowe rozszerzenia X Render
+Group: X11/Libraries
+Requires: %{name}-devel = %{version}
+Requires: %{name}-render = %{version}
+Requires: %{name}-xrender = %{version}
+
+%description xrender-devel
+X render library headers.
+
+%description xrender-devel -l pl
+Pliki nag³ówkowe biblioteki X render.
+
+%package xrender-static
+Summary: X Render static library
+Summary(pl): Biblioteka statyczna X render
+Group: X11/Libraries/Development
+Requires: %{name}-xrender-devel = %{version}
+
+%description xrender-static
+X render static library.
+
+%description xrender-static -l pl
+Biblioteka statyczna X render.
+
+%package xcursor
+Summary: X cursor library
+Summary(pl): Biblioteka X cursor
+Group: X11/Libraries
+Requires: %{name}-libs = %{version}
+
+%description xcursor
+X cursor library.
+
+%description xcursor -l pl
+Biblioteka X cursor.
+
+%package xcursor-devel
+Summary: X cursor library headers
+Summary(pl): Pliki nag³ówkowe biblioteki X cursor
+Group: X11/Libraries/Development
+Requires: %{name}-devel = %{version}
+Requires: %{name}-xcursor = %{version}
+
+%description xcursor-devel
+X cursor library headers.
+
+%description xcursor-devel -l pl
+Pliki nag³ówkowe biblioteki X cursor.
+
+%package xcursor-static
+Summary: X cursor static library
+Summary(pl): Biblioteka statyczna X cursor
+Group: X11/Libraries/Development
+Requires: %{name}-xcursor-devel = %{version}
+
+%description xcursor-static
+X cursor static library.
+
+%description xcursor-static -l pl
+Biblioteka statyczna X cursor.
+
%package OpenGL-core
Summary: OpenGL support for X11R6
Summary(pl): Wsparcie OpenGL dla systemu X11R6
Group: X11/Development/Libraries
Requires: %{name}-OpenGL-libs = %{version}
Requires: %{name}-devel
-Requires: OpenGL-devel-base
+Requires: OpenGL-devel-base
Provides: OpenGL-devel
Obsoletes: Mesa-devel
Obsoletes: glxMesa-devel
Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6.
%package OpenGL-devel-base
-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: %{name}-OpenGL-libs = %{version}
-Requires: %{name}-devel
-Provides: OpenGL-devel-base
+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: %{name}-OpenGL-libs = %{version}
+Requires: %{name}-devel
+Provides: OpenGL-devel-base
Requires: OpenGL-devel
%description OpenGL-devel-base
%description OpenGL-devel-base -l pl
Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6.
-
%package OpenGL-libs
Summary: OpenGL libraries for X11R6
Summary(pl): Biblioteki OpenGL dla systemu X11R6
÷ÓÔÁÎÏצÔØ XFree86-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦
ÂÕÄÕÔØ ÐÒÁÃÀ×ÁÔÉ ÑË X-Ë̦¤ÎÔÉ.
+%package Xserver-devel
+Summary: Header files for XFree86 Xserver drivers/extensions development
+Summary(pl): Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera XFree86
+Group: X11/Development/Libraries
+Requires: %{name}-devel = %{version}
+
+%description Xserver-devel
+Header files for XFree86 Xserver drivers and extensions development.
+
+%description Xserver-devel -l pl
+Pliki nag³ówkowe do tworzenia sterowników i rozszerzeñ X serwera
+XFree86.
+
%package driver-apm
Summary: Alliance Promotion video driver
Summary(pl): Sterownik do kart Alliance Promotion
Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
%description driver-ati.2
-ATI video driver (ATI.2) from gatos
-(http://gatos.sourceforge.net/).
+ATI video driver (ATI.2) from gatos (http://gatos.sourceforge.net/).
%description driver-ati.2 -l pl
Sterownik do kart ATI (ATI.2) projektu gatos
Requires: %{name}-libs = %{version}
Requires: XFree86-fonts-base
PreReq: chkconfig
-Requires(pre): user-xfs
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/groupadd
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
Obsoletes: xfsft XFree86-xfs
%description -n xfs
#--- %prep ---------------------------
%prep
-%setup -q -c -b3
+%setup -q -c -b3 -a40
#-b1 -b2 -a3
%patch0 -p0
%patch1 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
+%patch10 -p0
#%patch11 -p0 -- obsoleted???
%patch12 -p1
%patch13 -p1
rm -f xc/config/cf/host.def
+#Remove fonts dir for faster build
+# only valid for snapshots
+rm -rf xc/fonts
+
# New ATI drivers
# cd xc/programs/Xserver/hw/xfree86/drivers
#%bzcat %{SOURCE39} | tar x
%build
%{__make} -S -C xc World DEFAULT_OS_CPU_FROB=%{_target_cpu} \
- "BOOTSTRAPCFLAGS=%{rpmcflags}" \
- "CCOPTIONS=%{rpmcflags}" \
- "CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
- "ICONDIR=%{_icondir}"
+ CC="%{__cc}" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_icondir}" \
+ LINUXDIR="%{_kernelsrcdir}"
%ifnarch alpha
#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
# "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
%endif
+cd synaptics
+%{__make} \
+ TOP=$(pwd)/xc \
+ CC="%{__cc}" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_icondir}" \
+ LINUXDIR="%{_kernelsrcdir}"
+
+for f in COMPATIBILITY FEATURES INSTALL NEWS PARAMETER; do
+ cp -f ${f} ${f}.synaptics
+done
+
#--- %install ------------------------
%install
$RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \
$RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
-%{__make} -C xc "DESTDIR=$RPM_BUILD_ROOT" \
- "DOCDIR=/usr/share/doc/%{name}-%{version}" \
- "INSTBINFLAGS=-m 755" \
- "INSTPGMFLAGS=-m 755" \
- "RAWCPP=/lib/cpp" \
- "BOOTSTRAPCFLAGS=%{rpmcflags}" \
- "CCOPTIONS=%{rpmcflags}" \
- "CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
- "ICONDIR=%{_icondir}" \
- install install.man
+%{__make} -C xc install install.man \
+ DESTDIR="$RPM_BUILD_ROOT" \
+ DOCDIR="/usr/share/doc/%{name}-%{version}" \
+ INSTBINFLAGS="-m 755" \
+ INSTPGMFLAGS="-m 755" \
+ RAWCPP="/lib/cpp" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_icondir}" \
+ LINUXDIR="%{_kernelsrcdir}"
+
+install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input/
%ifnarch alpha
#install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
#install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
-
%endif
# setting default X
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so
+# collect Xserver headers
+install -d $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+cd xc/programs/Xserver
+# don't change to single install - there are symlinked "duplicates"
+install include/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+install hw/xfree86/{common,os-support}/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+cd -
+
# set up PLD xdm config
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps
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 \
fr ga gl he hr hu is it ja ko lt mi mk nl nn no pl pt pt_BR ro ru sk \
- sl sr sv ta th tr uk wa zh_CN zh_CN.GB2312 zh_TW.Big5 ; do
+ sl sr sv ta th tr uk wa zh_CN zh_TW ; do
install -d $RPM_BUILD_ROOT%{_datadir}/locale/${lang}/LC_MESSAGES
echo "%lang(${lang}) %{_datadir}/locale/${lang}" >> XFree86-libs.lang
done
/sbin/chkconfig --del xdm
fi
+%pre -n xfs
+if [ -n "`/usr/bin/getgid xfs`" ]; then
+ if [ "`/usr/bin/getgid xfs`" != "56" ]; then
+ echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2
+ exit 1
+ fi
+else
+ /usr/sbin/groupadd -g 56 -r -f xfs
+fi
+if [ -n "`/bin/id -u xfs 2>/dev/null`" ]; then
+ if [ "`/bin/id -u xfs`" != "56" ]; then
+ echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2
+ exit 1
+ fi
+else
+ /usr/sbin/useradd -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs 1>&2
+fi
+
%post -n xfs
/sbin/chkconfig --add xfs
if [ -f /var/lock/subsys/xfs ]; then
/sbin/chkconfig --del xfs
fi
+%postun -n xfs
+if [ "$1" = "0" ]; then
+ /usr/sbin/userdel xfs 2>/dev/null
+ /usr/sbin/groupdel xfs 2>/dev/null
+fi
+
+
+%post xrender -p /sbin/ldconfig
+%postun xrender -p /sbin/ldconfig
+
+%post xcursor -p /sbin/ldconfig
+%postun xcursor -p /sbin/ldconfig
+
#--- %files --------------------------
%files
%defattr(644,root,root,755)
+%doc synaptics/*.synaptics
%ifnarch sparc sparc64
%doc %{_docdir}/%{name}-%{version}
%doc %{_libdir}/X11/doc
%files fontconfig-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fontconfig-config
+#%attr(755,root,root) %{_bindir}/fontconfig-config
%{_includedir}/fontconfig
%{_libdir}/libfontconfig.so
-%{_pkgconfigdir}/fontconfig.pc
+#%{_pkgconfigdir}/fontconfig.pc
%{_mandir}/man3/fontconfig.3*
%files fontconfig-static
%defattr(644,root,root,755)
%{_libdir}/libfontconfig.a
+%files render
+%defattr(644,root,root,755)
+%{_includedir}/X11/extensions/render.h
+%{_includedir}/X11/extensions/renderproto.h
+
+%files xrender
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libXrender.so.*.*
+
+%files xrender-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libXrender.so
+%{_includedir}/X11/extensions/Xrender.h
+
+%files xrender-static
+%defattr(644,root,root,755)
+%{_libdir}/libXrender.a
+
+%files xcursor
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libXcursor.so.*.*
+
+%files xcursor-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xcursor-config
+%attr(755,root,root) %{_libdir}/libXcursor.so
+%{_includedir}/X11/Xcursor
+%{_pkgconfigdir}/xcursor.pc
+
+%files xcursor-static
+%defattr(644,root,root,755)
+%{_libdir}/libXcursor.a
+
%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*
%attr(755,root,root) %{_libdir}/libOSMesa*.so
%{_libdir}/libGLw.a
%dir %{_includedir}/GL
+%dir /usr/include/GL
%attr(644,root,root) %{_includedir}/GL/*
%exclude %{_includedir}/GL/gl.h
%exclude %{_includedir}/GL/glx.h
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
-%attr(755,root,root) %{_bindir}/xcursor-config
%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so
%attr(755,root,root) %{_libdir}/libXfont*.so
%attr(755,root,root) %{_libdir}/libI*.so
%{_libdir}/libI810XvMC.a
%{_libdir}/liboldX.a
%{_libdir}/libXau.a
-%{_libdir}/libXcursor.a
%{_libdir}/libXdmcp.a
%{_libdir}/libxf86config.a
%{_libdir}/libXfontcache.a
%{_libdir}/libXxf86misc.a
%{_libdir}/libXxf86rush.a
%{_libdir}/libXxf86vm.a
-%{_includedir}/X11/*.h
+%{_includedir}/X11/*.h
%{_includedir}/X11/ICE
%{_includedir}/X11/PM
%{_includedir}/X11/SM
%{_includedir}/X11/extensions/XI.h
%{_includedir}/X11/extensions/XI[^E]*.h
%{_includedir}/X11/fonts
-%{_includedir}/X11/Xcursor
%{_includedir}/xf86*.h
%{_libdir}/X11/config
-%{_pkgconfigdir}/xcursor.pc
+
+%exclude %{_includedir}/X11/extensions/Xrender.h
+%exclude %{_includedir}/X11/extensions/render.h
+%exclude %{_includedir}/X11/extensions/renderproto.h
+%exclude %{_libdir}/libXrender.so
+%exclude %{_libdir}/libXcursor.so
%{_mandir}/man3/[A-EH-Z]*
%exclude %{_mandir}/man3/Xft.3*
+%files Xserver-devel
+%defattr(644,root,root,755)
+%{_includedir}/X11/Xserver
+
# Devel: sparc sparc64
%ifarch %{ix86}
%files driver-apm
%files driver-via
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
+%{_mandir}/man4/via.4*
%endif
# Devel: sparc sparc64
%attr(755,root,root) %{_libdir}/libx*.so.*.*
%attr(755,root,root) %{_libdir}/libXv.so.*.*
+%exclude %{_libdir}/libXrender.so.*.*
+%exclude %{_libdir}/libXcursor.so.*.*
+
%files modules
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xkbcomp
%{_libdir}/libXmuu.a
%{_libdir}/libXp.a
%{_libdir}/libXpm.a
-%{_libdir}/libXrender.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
%attr(755,root,root) %{_bindir}/fstobdf
%attr(755,root,root) %{_bindir}/mkcfm
%attr(755,root,root) %{_bindir}/xfsinfo
-#%attr(755,root,root) %{_bindir}/xftcache
%{_mandir}/man1/xfs.1*
%{_mandir}/man1/fslsfonts.1*
%{_mandir}/man1/fstobdf.1*
%{_mandir}/man1/mkcfm.1*
%{_mandir}/man1/xfsinfo.1*
-#%%{_mandir}/man1/xftcache.1*
projects / packages / XFree86.git / blobdiff