Author: qboosh Date: Fri Oct 21 19:19:22 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - more BRs, fixed mandirs, enabled more extensions - set default font path to PLD-specific
---- Files affected: SPECS: xorg-xserver-server.spec (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SPECS/xorg-xserver-server.spec diff -u SPECS/xorg-xserver-server.spec:1.3 SPECS/xorg-xserver-server.spec:1.4 --- SPECS/xorg-xserver-server.spec:1.3 Fri Oct 21 00:16:47 2005 +++ SPECS/xorg-xserver-server.spec Fri Oct 21 21:19:16 2005 @@ -6,7 +6,7 @@ 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 @@ -15,51 +15,67 @@ # 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 @@ -71,18 +87,24 @@ 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} @@ -91,29 +113,32 @@ 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) @@ -126,6 +151,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2005/10/21 19:19:16 qboosh +- more BRs, fixed mandirs, enabled more extensions +- set default font path to PLD-specific + Revision 1.3 2005/10/20 22:16:47 jpc - add devel subpackage - add packaged files ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-xserver-server.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
