Author: arekm Date: Tue Jun 10 18:09:37 2008 GMT
Module: SPECS Tag: XORG_XSERVER_1_4
---- Log message:
- up to 1.4.1; use mesa 7.0.3; obsolete patches dropped; xprint dropped on
master, broken so we drop it here, too
---- Files affected:
SPECS:
xorg-xserver-server.spec (1.123 -> 1.123.2.1)
---- Diffs:
================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.123
SPECS/xorg-xserver-server.spec:1.123.2.1
--- SPECS/xorg-xserver-server.spec:1.123 Mon Jan 21 16:58:11 2008
+++ SPECS/xorg-xserver-server.spec Tue Jun 10 20:09:32 2008
@@ -10,26 +10,25 @@
#
# Conditional build:
%bcond_with multigl # package libglx.so in a way allowing
concurrent install with nvidia/fglrx drivers
+%bcond_with xprint
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.4.0.90
-Release: 2%{?with_multigl:.mgl}
+Version: 1.4.1
+Release: 1%{?with_multigl:.mgl}
License: MIT
Group: X11/Servers
Source0:
http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: bb16e969850dbb5d3805cb88d35656d0
-%define mesa_version 7.0.2
+# Source0-md5: 0d638b6857408bb2e564e0c7b772d9a1
+%define mesa_version 7.0.3
Source1: http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2
-# Source1-md5: 93e6ed7924ff069a4f883b4fce5349dc
+# Source1-md5: e6e6379d7793af40a6bc3ce1bace572e
Source2: xserver.pamd
Patch0: %{name}-ncurses.patch
Patch1: %{name}-xwrapper.patch
# nasty hack for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
Patch2: %{name}-gcc-x86_64-workaround.patch
-Patch3: %{name}-link.patch
-Patch4:
ftp://ftp.freedesktop.org/pub/xorg/X11R7.3/patches/xorg-xserver-1.4-multiple-overflows-v2.diff
URL: http://xorg.freedesktop.org/
# for glx headers
BuildRequires: OpenGL-GLX-devel
@@ -292,8 +291,6 @@
%ifarch %{x8664} i486
%patch2 -p1
%endif
-%patch3 -p1
-%patch4 -p1
rm hw/xprint/{miinitext-wrapper,dpmsstubs-wrapper}.c
@@ -345,7 +342,7 @@
--enable-lbx \
--enable-xevie \
--enable-xorgcfg \
- --enable-xprint \
+ %{?with_xprint:--enable-xprint} \
--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi"
\
--with-mesa-source="`pwd`/Mesa-%{mesa_version}" \
@@ -464,11 +461,13 @@
%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)
@@ -505,6 +504,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.123.2.1 2008-06-10 18:09:32 arekm
+- up to 1.4.1; use mesa 7.0.3; obsolete patches dropped; xprint dropped on
master, broken so we drop it here, too
+
Revision 1.123 2008-01-21 15:58:11 arekm
- rel 2; fix regressions caused by xorg-xserver-1.4-multiple-overflows v1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.123&r2=1.123.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
