- updated to 1.0.99.1, updated glibc-locale_sync patch

- xcb disabled by default

Changed files:
    xorg-lib-libX11.spec -> 1.22

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 0faa0de8a9c55ee9d679ccb84b49ba6a1963534c..82902149f858f07ba64f9102a2c67349502f58dc 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -1,18 +1,23 @@
+#
+# 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
@@ -24,7 +29,7 @@ BuildRequires:        xorg-proto-xproto-devel >= 7.0.6
 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)
 
@@ -39,6 +44,7 @@ Summary:      Header files for libX11 library
 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
@@ -84,7 +90,8 @@ Pakiet zawiera statyczn
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       %{!?with_xcb:--without-xcb}
 
 %{__make}
 
@@ -105,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -118,8 +128,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_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