- added Synaptics TouchPad driver

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index b05b9aa0315687358e30da3255ddba768ece4209..0f1cd2a162d30e1820078edfbf57bd316cc95983 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -8,6 +8,7 @@
 #
 
 %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
@@ -22,12 +23,12 @@ Summary(ru):        
 Summary(uk):   âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):        XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          XFree86
-Version:       4.3.99.5
-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: d01d01a7abd4f0764e20ef493f76a3b2
+# 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-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
@@ -52,19 +53,17 @@ Source30:   xlogo64.png
 Source31:      xeyes.png
 Source32:      xedit.png
 Source33:      xterm.png
-# Source33-md5:        a9e182f1f2ce977c51cdfd28dae53fdb
 Source34:      xclipboard.png
-# Source34-md5:        a2eb1994b5b6871124178d0ce518f157
 Source35:      xclock.png
-# Source35-md5:        b7a0e68f24dc55bfed08220bfdc7e538
 Source36:      oclock.png
-# Source36-md5:        1bd2b33adc6ff3e7607a164d9fd16e8a
 Source37:      xconsole.png
-# Source37-md5:        7da3e9920e4b03dd643425f426c52adc
 Source38:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
-# Source38-md5: a184106bb83cb27c6963944d9243ac3f
-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
@@ -116,13 +115,12 @@ Patch45:  %{name}-VidMode-nocrashafterfailure.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
@@ -884,6 +882,19 @@ XFree86-devel ͦ
 ÷ÓÔÁÎÏצÔØ 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
@@ -1916,7 +1927,7 @@ System. 
 #--- %prep ---------------------------
 
 %prep
-%setup -q -c -b3
+%setup -q -c -b3 -a40
 #-b1 -b2 -a3
 %patch0 -p0
 %patch1 -p1
@@ -1928,7 +1939,7 @@ System. 
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p0
 #%patch11 -p0  -- obsoleted???
 %patch12 -p1
 %patch13 -p1
@@ -2002,6 +2013,22 @@ rm -rf xc/fonts
 #      "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
@@ -2029,13 +2056,14 @@ install -d $RPM_BUILD_ROOT/etc/{X11/fs,pam.d,rc.d/init.d,security/console.apps,s
        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}
 #install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \
 #      $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
@@ -2055,6 +2083,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libGL*.so
 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
@@ -2109,7 +2145,7 @@ mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
 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
@@ -2244,6 +2280,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
+%doc synaptics/*.synaptics
 %ifnarch sparc sparc64
 %doc %{_docdir}/%{name}-%{version}
 %doc %{_libdir}/X11/doc
@@ -2513,21 +2550,55 @@ fi
 
 %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*
@@ -2538,6 +2609,7 @@ fi
 %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
@@ -2600,7 +2672,6 @@ fi
 %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
@@ -2652,6 +2723,10 @@ fi
 %{_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
@@ -3293,44 +3368,9 @@ fi
 %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*
-
-%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