- require xorg-font-font-misc-misc-base, which contains fixed font

[packages/xorg-xserver-server.git] / xorg-xserver-server.spec

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 4ae552333182373ce6c808a286bef14e48176643..4fc3732ea0dbfb6b765d3c989978e3a4140f664c 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -1,18 +1,19 @@
-# TODO:
-# - Xdmx DDX (now disabled in configure)
-#
 Summary:       X.org server
 Summary(pl):   Serwer X.org
 Name:          xorg-xserver-server
-Version:       0.99.3
-Release:       0.1
+Version:       1.0.1
+Release:       0.6
 License:       MIT
 Group:         X11/Servers
-Source0:       http://xorg.freedesktop.org/releases/X11R7.0-RC2/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 82a9ccf391ee2473c456407a8eceda2d
-Source1:       http://dl.sourceforge.net/mesa3d/MesaLib-6.4.tar.bz2
+Source0:       http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-%{version}.tar.bz2
+# Source0-md5: aa0ccb851ec5f7f9b132581d9a5827e4
+Source1:       http://dl.sourceforge.net/mesa3d/MesaLib-6.4.2.tar.bz2
+# Source1-md5: 7674d2c603b5834259e4e5a820cefd5b
+Source2:       xserver.pamd
 Patch0:                %{name}-ncurses.patch
 Patch1:                %{name}-symlinks.patch
+Patch2:                %{name}-xwrapper.patch
+Patch3:                %{name}-compositefastpath.patch
 URL:           http://xorg.freedesktop.org/
 # for glx headers
 BuildRequires: Mesa-libGL-devel
@@ -22,17 +23,19 @@ BuildRequires:      cpp
 BuildRequires: libdrm-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
+BuildRequires: pam-devel
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xorg-lib-libXaw-devel
 BuildRequires: xorg-lib-libXdmcp-devel
+BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXfont-devel
 BuildRequires: xorg-lib-libXi-devel
-BuildRequires: xorg-lib-libXmu-devel
-BuildRequires: xorg-lib-libXpm-devel
+BuildRequires: xorg-lib-libXrender-devel
 BuildRequires: xorg-lib-libXres-devel
-BuildRequires: xorg-lib-libXt-devel
+BuildRequires: xorg-lib-libXt-devel >= 1.0.0
 BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: xorg-lib-libXxf86dga-devel
 BuildRequires: xorg-lib-libXxf86misc-devel
@@ -46,6 +49,7 @@ BuildRequires:        xorg-lib-xtrans-devel
 BuildRequires: xorg-proto-bigreqsproto-devel
 BuildRequires: xorg-proto-compositeproto-devel
 BuildRequires: xorg-proto-damageproto-devel
+BuildRequires: xorg-proto-dmxproto-devel
 BuildRequires: xorg-proto-evieext-devel
 BuildRequires: xorg-proto-fixesproto-devel
 BuildRequires: xorg-proto-fontsproto-devel
@@ -67,13 +71,19 @@ 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
+BuildRequires: xorg-util-util-macros >= 0.99.2
 # for rgb.txt
-Requires:      xorg-app-rgb
+Requires:      xorg-app-rgb >= 0.99.3
 Requires:      xorg-app-xkbcomp
 # just for %{_includedir}/bitmaps dir
 Requires:      xorg-data-xbitmaps
 Requires:      xorg-data-xkbdata
+# xserver requires default fixed and cursosr fonts.
+Requires:      xorg-font-font-alias
+Requires:      xorg-font-font-cursor-misc
+Requires:      xorg-font-font-misc-misc-base
+# for new app-defaults location
+Requires:      xorg-lib-libXt >= 1.0.0
 Obsoletes:     X11-Xserver
 Obsoletes:     X11-modules
 Obsoletes:     XFree86-Xserver
@@ -196,6 +206,8 @@ Pliki nag
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
+%patch3 -p0
 
 %build
 %{__libtoolize}
@@ -205,11 +217,11 @@ Pliki nag
 %{__automake}
 %configure \
        --enable-dga \
+       --enable-builddocs \
        --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.4"
+       --with-mesa-source="`pwd`/Mesa-6.4.2"
 
 %{__make}
 
@@ -217,10 +229,12 @@ Pliki nag
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       appmandir=%{_mandir}/man1 \
-       drivermandir=%{_mandir}/man4 \
-       filemandir=%{_mandir}/man5
+       DESTDIR=$RPM_BUILD_ROOT
+
+install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
+install -d $RPM_BUILD_ROOT/etc/security/console.apps
+:> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
+:> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
@@ -229,9 +243,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog
+%doc COPYING ChangeLog
 %attr(755,root,root) %{_bindir}/X
 %attr(755,root,root) %{_bindir}/Xorg
+%attr(4755,root,root) %{_bindir}/Xwrapper
 %attr(755,root,root) %{_bindir}/getconfig
 %attr(755,root,root) %{_bindir}/getconfig.pl
 %attr(755,root,root) %{_bindir}/gtf
@@ -245,29 +260,42 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/bitmaps/*
 %{_includedir}/X11/pixmaps
 %{_libdir}/X11/Cards
-%{_libdir}/X11/app-defaults/XOrgCfg
+%{_libdir}/X11/Options
 %{_libdir}/X11/getconfig
 %dir %{_libdir}/xorg
 %dir %{_libdir}/xorg/modules
 %attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
 %dir %{_libdir}/xorg/modules/extensions
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libGLcore.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libxtrap.so
+%dir %{_libdir}/xorg/modules/fonts
+%attr(755,root,root) %{_libdir}/xorg/modules/fonts/lib*.so
 %dir %{_libdir}/xorg/modules/linux
 %attr(755,root,root) %{_libdir}/xorg/modules/linux/libdrm.so
+%attr(755,root,root) %{_libdir}/xorg/modules/linux/libfbdevhw.so
 %dir %{_libdir}/xorg/modules/multimedia
 %attr(755,root,root) %{_libdir}/xorg/modules/multimedia/*.so
-%{_datadir}/X11/xkb/compiled
 %dir %{_libdir}/xserver
 %{_libdir}/xserver/SecurityPolicy
-%{_mandir}/man1/Xorg.1*
+%{_datadir}/X11/app-defaults/XOrgCfg
+%{_datadir}/X11/xkb/compiled
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
+%config(missingok) /etc/security/console.apps/xserver
+%{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*
-%{_mandir}/man1/getconfig.1*
-%{_mandir}/man1/gtf.1*
-%{_mandir}/man1/pcitweak.1*
-%{_mandir}/man1/scanpci.1*
-%{_mandir}/man1/xorgcfg.1*
+%{_mandir}/man1/getconfig.1x*
+%{_mandir}/man1/gtf.1x*
+%{_mandir}/man1/pcitweak.1x*
+%{_mandir}/man1/scanpci.1x*
+%{_mandir}/man1/xorgcfg.1x*
 %{_mandir}/man1/xorgconfig.1*
-%{_mandir}/man4/fbdevhw.4x*
+%{_mandir}/man4/fbdevhw.4*
 %{_mandir}/man5/getconfig.5x*
 %{_mandir}/man5/xorg.conf.5x*
 
@@ -285,26 +313,26 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/vdltodmx
 %attr(755,root,root) %{_bindir}/xdmx
 %attr(755,root,root) %{_bindir}/xdmxconfig
-%{_mandir}/man1/Xdmx.1*
-%{_mandir}/man1/dmxtodmx.1*
-%{_mandir}/man1/vdltodmx.1*
-%{_mandir}/man1/xdmxconfig.1*
+%{_mandir}/man1/Xdmx.1x*
+%{_mandir}/man1/dmxtodmx.1x*
+%{_mandir}/man1/vdltodmx.1x*
+%{_mandir}/man1/xdmxconfig.1x*
 
 %files -n xorg-xserver-Xnest
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Xnest
-%{_mandir}/man1/Xnest.1*
+%{_mandir}/man1/Xnest.1x*
 
 %files -n xorg-xserver-Xprt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Xprt
 %{_libdir}/X11/xserver
-%{_mandir}/man1/Xprt.1*
+%{_mandir}/man1/Xprt.1x*
 
 %files -n xorg-xserver-Xvfb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Xvfb
-%{_mandir}/man1/Xvfb.1*
+%{_mandir}/man1/Xvfb.1x*
 
 %files devel
 %defattr(644,root,root,755)