SPECS: xorg-lib-libX11.spec - updated to 1.0.99.1, updated glibc-l...

[qboosh]

Author: qboosh                       Date: Sat Oct 14 10:29:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.0.99.1, updated glibc-locale_sync patch
- xcb disabled by default

---- Files affected:
SPECS:
   xorg-lib-libX11.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/xorg-lib-libX11.spec
diff -u SPECS/xorg-lib-libX11.spec:1.21 SPECS/xorg-lib-libX11.spec:1.22
--- SPECS/xorg-lib-libX11.spec:1.21	Fri Jun 30 11:33:39 2006
+++ SPECS/xorg-lib-libX11.spec	Sat Oct 14 12:29:47 2006
@@ -1,19 +1,24 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	xcb	# use XCB for low-level protocol implementation
+#
 Summary:	X11 Base library
 Summary(pl):	Podstawowa biblioteka X11
 Name:		xorg-lib-libX11
-Version:	1.0.3
+Version:	1.0.99.1
 Release:	1
 License:	MIT
 Group:		X11/Libraries
 Source0:	http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5:	60b787a812c92d33f71860e4e19cb59d
+# Source0-md5:	c7478cff2fe70f56a4f0ac503a0900df
 Patch0:		%{name}-glibc-locale_sync.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	cpp
 BuildRequires:	libtool
+%{?with_xcb:BuildRequires:	libxcb-devel >= 0.9.92}
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	xorg-proto-bigreqsproto-devel
 BuildRequires:	xorg-proto-inputproto-devel
@@ -25,7 +30,7 @@
 BuildRequires:	xorg-lib-libXdmcp-devel
 BuildRequires:	xorg-lib-libXau-devel
 BuildRequires:	xorg-lib-xtrans-devel
-BuildRequires:	xorg-util-util-macros >= 0.99.2
+BuildRequires:	xorg-util-util-macros >= 1.1.0
 Obsoletes:	libX11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,6 +45,7 @@
 Summary(pl):	Pliki nagłówkowe biblioteki libX11
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{?with_xcb:Requires:	libxcb-devel >= 0.9.92}
 Requires:	xorg-lib-libXau-devel
 Requires:	xorg-lib-libXdmcp-devel
 Requires:	xorg-proto-kbproto-devel
@@ -85,7 +91,8 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{!?with_xcb:--without-xcb}
 
 %{__make}
 
@@ -106,6 +113,9 @@
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog README
 %attr(755,root,root) %{_libdir}/libX11.so.*.*.*
+%if %{with xcb}
+%attr(755,root,root) %{_libdir}/libX11-xcb.so.*.*.*
+%endif
 %dir %{_libdir}/X11
 %{_libdir}/X11/Xcms.txt
 %dir %{_datadir}/X11
@@ -119,11 +129,20 @@
 %{_libdir}/libX11.la
 %{_includedir}/X11/*.h
 %{_pkgconfigdir}/x11.pc
+%if %{with xcb}
+%attr(755,root,root) %{_libdir}/libX11-xcb.so
+%{_libdir}/libX11-xcb.la
+#%{_includedir}/X11/Xlib-xcb.h (already included in *.h above)
+%{_pkgconfigdir}/x11-xcb.pc
+%endif
 %{_mandir}/man3/*.3x*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libX11.a
+%if %{with xcb}
+%{_libdir}/libX11-xcb.a
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -131,6 +150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/10/14 10:29:47  qboosh
+- updated to 1.0.99.1, updated glibc-locale_sync patch
+- xcb disabled by default
+
 Revision 1.21  2006/06/30 09:33:39  qboosh
 - updated to 1.0.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-lib-libX11.spec?r1=1.21&r2=1.22&f=u