Author: arekm Date: Mon Mar 5 07:49:17 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 1.2.99.901
---- Files affected: SPECS: xorg-xserver-server.spec (1.68 -> 1.69) ---- Diffs: ================================================================ Index: SPECS/xorg-xserver-server.spec diff -u SPECS/xorg-xserver-server.spec:1.68 SPECS/xorg-xserver-server.spec:1.69 --- SPECS/xorg-xserver-server.spec:1.68 Mon Feb 12 23:09:25 2007 +++ SPECS/xorg-xserver-server.spec Mon Mar 5 08:49:12 2007 @@ -1,30 +1,19 @@ # $Revision$, $Date$ -# NOTE: -# - DMX is broken at this moment (so --disable-dmx added for now) -# - same for xprint -# -# Conditional build: -%bcond_with dmx # Xdmx server -%bcond_with xprint # Xprint server -# Summary: X.org server Summary(pl.UTF-8): Serwer X.org Name: xorg-xserver-server -Version: 1.2.99.0 -Release: 0.2 +Version: 1.2.99.901 +Release: 0.1 License: MIT Group: X11/Servers Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2 -# Source0-md5: b21e7262541f6d3c8c5dfdfd29238bbe +# Source0-md5: 7fa14761413ffaf36c0bf591cf419709 %define mesa_version 6.5.2 Source1: http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2 # Source1-md5: e4d894181f1859651658b3704633e10d Source2: xserver.pamd Patch0: %{name}-ncurses.patch -Patch1: %{name}-symlinks.patch -Patch2: %{name}-xwrapper.patch -Patch3: %{name}-dbus.patch -Patch4: %{name}-xkb.patch +Patch1: %{name}-xwrapper.patch URL: http://xorg.freedesktop.org/ # for glx headers BuildRequires: OpenGL-GLX-devel @@ -54,7 +43,7 @@ BuildRequires: xorg-lib-libXxf86dga-devel BuildRequires: xorg-lib-libXxf86misc-devel BuildRequires: xorg-lib-libXxf86vm-devel -%{?with_dmx:BuildRequires: xorg-lib-libdmx-devel} +BuildRequires: xorg-lib-libdmx-devel BuildRequires: xorg-lib-libfontenc-devel BuildRequires: xorg-lib-liblbxutil-devel BuildRequires: xorg-lib-libxkbfile-devel @@ -63,12 +52,12 @@ BuildRequires: xorg-proto-bigreqsproto-devel BuildRequires: xorg-proto-compositeproto-devel >= 0.3 BuildRequires: xorg-proto-damageproto-devel -%{?with_dmx:BuildRequires: xorg-proto-dmxproto-devel} +BuildRequires: xorg-proto-dmxproto-devel BuildRequires: xorg-proto-evieext-devel BuildRequires: xorg-proto-fixesproto-devel >= 4.0 BuildRequires: xorg-proto-fontcacheproto-devel BuildRequires: xorg-proto-fontsproto-devel -BuildRequires: xorg-proto-glproto-devel >= 1.4.7 +BuildRequires: xorg-proto-glproto-devel >= 1.4.8 BuildRequires: xorg-proto-inputproto-devel >= 1.4 BuildRequires: xorg-proto-kbproto-devel >= 1.0.3 BuildRequires: xorg-proto-printproto-devel @@ -241,10 +230,7 @@ %prep %setup -q -a1 -n xorg-server-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p0 -%patch3 -p0 -%patch4 -p1 +%patch1 -p0 %build %{__libtoolize} @@ -259,16 +245,13 @@ --enable-builddocs \ --enable-lbx \ --enable-xevie \ - --%{?with_dmx:en}%{!?with_dmx:dis}able-dmx \ - --%{?with_dmx:en}%{!?with_dmx:dis}able-xprint \ + --enable-dmx \ + --enable-xprint \ --with-dri-driver-path=%{_libdir}/xorg/modules/dri \ - --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \ + --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \ --with-mesa-source="`pwd`/Mesa-%{mesa_version}" \ --with-xkb-output=/var/lib/xkb -# workarounds -sed -i -e 's#CONFIG_H#XXX_MESA_CONFIG_H#g' GL/mesa/main/config.h - %{__make} %install @@ -286,9 +269,6 @@ :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver -# missing include (needed by -driver-keyboard) -install hw/xfree86/common/xf86Keymap.h $RPM_BUILD_ROOT%{_includedir}/xorg/xf86Keymap.h - rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a} %clean @@ -307,10 +287,10 @@ %attr(755,root,root) %{_bindir}/out[bwl] %attr(755,root,root) %{_bindir}/pcitweak %attr(755,root,root) %{_bindir}/scanpci -#%attr(755,root,root) %{_bindir}/xorgcfg +%attr(755,root,root) %{_bindir}/xorgcfg %attr(755,root,root) %{_bindir}/xorgconfig -#%{_includedir}/X11/bitmaps/* -#%{_includedir}/X11/pixmaps +%{_includedir}/X11/bitmaps/* +%{_includedir}/X11/pixmaps %{_libdir}/X11/Cards %{_libdir}/X11/Options %dir %{_libdir}/xorg @@ -328,17 +308,15 @@ %attr(755,root,root) %{_libdir}/xorg/modules/fonts/lib*.so %dir %{_libdir}/xorg/modules/input %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 %attr(755,root,root) %{_libdir}/xorg/modules/lib*.so %dir %{_libdir}/xserver %{_libdir}/xserver/SecurityPolicy -#%{_datadir}/X11/app-defaults/XOrgCfg +%{_datadir}/X11/app-defaults/XOrgCfg %dir /var/lib/xkb /var/lib/xkb/README.compiled -/etc/dbus-1/system.d/*.conf %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 @@ -348,13 +326,12 @@ %{_mandir}/man1/gtf.1x* %{_mandir}/man1/pcitweak.1x* %{_mandir}/man1/scanpci.1x* -#%{_mandir}/man1/xorgcfg.1x* +%{_mandir}/man1/xorgcfg.1x* %{_mandir}/man1/xorgconfig.1* %{_mandir}/man4/exa.4* %{_mandir}/man4/fbdevhw.4* %{_mandir}/man5/xorg.conf.5x* -%if %{with dmx} %files -n xorg-xserver-Xdmx %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/Xdmx @@ -373,20 +350,17 @@ %{_mandir}/man1/dmxtodmx.1x* %{_mandir}/man1/vdltodmx.1x* %{_mandir}/man1/xdmxconfig.1x* -%endif %files -n xorg-xserver-Xnest %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/Xnest %{_mandir}/man1/Xnest.1x* -%if %{with xprint} %files -n xorg-xserver-Xprt %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/Xprt %{_libdir}/X11/xserver %{_mandir}/man1/Xprt.1x* -%endif %files -n xorg-xserver-Xvfb %defattr(644,root,root,755) @@ -397,7 +371,6 @@ %defattr(644,root,root,755) %{_includedir}/xorg %{_libdir}/libxf86config.a -%{_libdir}/libconfig.a %{_aclocaldir}/xorg-server.m4 %{_pkgconfigdir}/xorg-server.pc @@ -411,6 +384,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.69 2007/03/05 07:49:12 arekm +- up to 1.2.99.901 + Revision 1.68 2007/02/12 22:09:25 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xorg-xserver-server.spec?r1=1.68&r2=1.69&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
