- more BRs, fixed mandirs, enabled more extensions

- set default font path to PLD-specific

Changed files:
    xorg-xserver-server.spec -> 1.4

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 82fd2e78676ee79c4d4f6e3730185836ffb5711e..0c711d89396b85c641a35a43b9c917c45d6cd6ef 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -5,7 +5,7 @@ Summary:        X.org server
 Summary(pl):   Serwer X.org
 Name:          xorg-xserver-server
 Version:       0.99.2
-Release:       0.01
+Release:       0.1
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/X11R7.0-RC1/xserver/xorg-server-%{version}.tar.bz2
@@ -14,51 +14,67 @@ Source1:    http://dl.sourceforge.net/mesa3d/MesaLib-6.3.2.tar.bz2
 # Source1-md5: 0df27701df0924d17ddf41185efa8ce1
 Patch0:                %{name}-ncurses.patch
 URL:           http://xorg.freedesktop.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: libdrm
+BuildRequires: cpp
+BuildRequires: libdrm-devel
+BuildRequires: libtool
 BuildRequires: ncurses-devel
+BuildRequires: perl-base
 BuildRequires: pkgconfig >= 0.19
-BuildRequires: xorg-lib-libfontenc-devel
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xorg-lib-libXaw-devel
+BuildRequires: xorg-lib-libXdmcp-devel
 BuildRequires: xorg-lib-libXfont-devel
+BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXpm-devel
+BuildRequires: xorg-lib-libXres-devel
 BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: xorg-lib-libXxf86dga-devel
 BuildRequires: xorg-lib-libXxf86misc-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
+BuildRequires: xorg-lib-libdmx-devel
+BuildRequires: xorg-lib-libfontenc-devel
+BuildRequires: xorg-lib-liblbxutil-devel
 BuildRequires: xorg-lib-libxkbfile-devel
 BuildRequires: xorg-lib-libxkbui-devel
 BuildRequires: xorg-lib-xtrans-devel
 BuildRequires: xorg-proto-bigreqsproto-devel
 BuildRequires: xorg-proto-compositeproto-devel
 BuildRequires: xorg-proto-damageproto-devel
+BuildRequires: xorg-proto-evieext-devel
 BuildRequires: xorg-proto-fixesproto-devel
 BuildRequires: xorg-proto-fontsproto-devel
-BuildRequires: xorg-proto-glproto-devel
+BuildRequires: xorg-proto-glproto-devel >= 1.4.1
+BuildRequires: xorg-proto-printproto-devel
 BuildRequires: xorg-proto-randrproto-devel
 BuildRequires: xorg-proto-recordproto-devel
 BuildRequires: xorg-proto-renderproto-devel
 BuildRequires: xorg-proto-resourceproto-devel
 BuildRequires: xorg-proto-scrnsaverproto-devel
+BuildRequires: xorg-proto-trapproto-devel
 BuildRequires: xorg-proto-videoproto-devel
 BuildRequires: xorg-proto-xcmiscproto-devel
 BuildRequires: xorg-proto-xextproto-devel
 BuildRequires: xorg-proto-xf86bigfontproto-devel
+BuildRequires: xorg-proto-xf86dgaproto-devel
 BuildRequires: xorg-proto-xf86driproto-devel
 BuildRequires: xorg-proto-xf86miscproto-devel
 BuildRequires: xorg-proto-xf86vidmodeproto-devel
 BuildRequires: xorg-proto-xineramaproto-devel
 BuildRequires: xorg-proto-xproto-devel
+BuildRequires: xorg-util-util-macros >= 0.99.1
+# just for %{_includedir}/bitmaps dir
+Requires:      xorg-data-xbitmaps
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-X.org server
+X.org server.
 
 %description -l pl
-Serwer X.org
+Serwer X.org.
 
 %package devel
 Summary:       Header files for X.org server
@@ -70,18 +86,24 @@ Requires:   %{name} = %{version}-%{release}
 Header files for X.org server.
 
 %description devel -l pl
-Pliki nag³ówkowe dla servera X.org.
+Pliki nag³ówkowe dla serwera X.org.
 
 %prep
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-dga \
+       --enable-lbx \
+       --enable-xevie \
+       --enable-xtrap \
+       --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
        --with-mesa-source="`pwd`/Mesa-6.3.2"
 
 %{__make}
@@ -90,29 +112,32 @@ Pliki nag
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       drivermandir=%{_mandir}/man4 \
+       filenamdir=%{_mandir}/man5
 
-rm $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*/*{.la,.a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*/*{.la,.a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ChangeLog
 %attr(755,root,root) %{_bindir}/*
-%{_includedir}/X11/*
-
-# app-default should go to xorg-lib-libX11?
-%{_libdir}/X11/*
+%{_includedir}/X11/bitmaps/*
+%{_includedir}/X11/pixmaps
+%{_libdir}/X11/Cards
+%{_libdir}/X11/app-defaults/*
+%{_libdir}/X11/getconfig
+%{_libdir}/X11/xserver
 # broken symlinks:
 %exclude %{_libdir}/X11/xserver/C/print
 %{_libdir}/xorg
-
 %{_datadir}/X11/xkb/compiled
-
 %{_mandir}/man1/*.1*
-%{_mandir}/man4x/*.4x*
-%{_mandir}/man5x/*.5x*
+%{_mandir}/man4/*.4x*
+%{_mandir}/man5/*.5x*
 
 %files devel
 %defattr(644,root,root,755)