# Conditional build:
%bcond_without static_libs # don't build static library
%bcond_without xcb # XCB for low-level protocol implementation
-%bcond_without docs # don't package devel docs (allows bootstrapping)
+%bcond_without doc # don't package devel docs (allows bootstrapping)
#
Summary: Core X11 protocol client library
Summary(pl.UTF-8): Podstawowa biblioteka kliencka protokołu X11
Name: xorg-lib-libX11
-Version: 1.3.1
-Release: 1
+Version: 1.3.6
+Release: 2
License: MIT
Group: X11/Libraries
Source0: http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: 5e6895c6003f3f0172ba8a07b865d8b2
+# Source0-md5: 8e0a8a466aa78f66e09fe06cb395319f
# sync locales and their encodings with glibc
Patch0: %{name}-glibc-locale_sync.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: cpp
-%if %{with docs}
+%if %{with doc}
# ps2pdf
BuildRequires: ghostscript
BuildRequires: groff
BuildRequires: xorg-proto-xextproto-devel
BuildRequires: xorg-proto-xf86bigfontproto-devel
BuildRequires: xorg-proto-xproto-devel >= 7.0.13
-BuildRequires: xorg-util-util-macros >= 1.3
+BuildRequires: xorg-util-util-macros >= 1.6
%if %{with xcb}
BuildRequires: libxcb-devel >= 1.2
%else
BuildRequires: xorg-proto-bigreqsproto-devel
BuildRequires: xorg-proto-xcmiscproto-devel
%endif
-%{?with_xcb:Requires: libxcb >= 1.2}
-Obsoletes: libX11
+Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
%description -l pl.UTF-8
Podstawowa biblioteka kliencka protokołu X11.
+%package libs
+Summary: libX11 library itself
+Summary(pl.UTF-8): Sama biblioteka libX11
+Group: Libraries
+Requires(post,postun): /sbin/ldconfig
+%{?with_xcb:Requires: libxcb >= 1.2}
+Obsoletes: libX11
+
+%description libs
+libX11 library itself.
+
+%description libs -l pl.UTF-8
+Sama biblioteka libX11.
+
%package devel
Summary: Header files for libX11 library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libX11
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
-%pretrans
+%pretrans libs
# this needs to be a dir
if [ -L %{_libdir}/X11 ]; then
umask 022
%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog README
-%attr(755,root,root) %{_libdir}/libX11.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libX11.so.6
-%if %{with xcb}
-%attr(755,root,root) %{_libdir}/libX11-xcb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libX11-xcb.so.1
-%endif
-%dir %{_libdir}/X11
-%{_libdir}/X11/Xcms.txt
%dir %{_datadir}/X11
%{_datadir}/X11/XErrorDB
-%{_datadir}/X11/XKeysymDB
%dir %{_datadir}/X11/locale
%{_datadir}/X11/locale/compose.dir
%{_datadir}/X11/locale/locale.alias
%lang(zh_TW) %{_datadir}/X11/locale/zh_TW
%lang(zh_TW) %{_datadir}/X11/locale/zh_TW.UTF-8
%lang(zh_TW) %{_datadir}/X11/locale/zh_TW.big5
+%{_mandir}/man5/*Compose.5x*
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libX11.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libX11.so.6
+%if %{with xcb}
+%attr(755,root,root) %{_libdir}/libX11-xcb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libX11-xcb.so.1
+%endif
+%dir %{_libdir}/X11
+%{_libdir}/X11/Xcms.txt
%files devel
%defattr(644,root,root,755)
# PDF chosen - docs include pictures
-%{?with_docs:%doc specs/XIM/xim.pdf specs/i18n/{Framework,LocaleDB,Trans}.pdf specs/libX11/libX11.pdf}
+%{?with_doc:%doc specs/XIM/xim.pdf specs/i18n/{Framework,LocaleDB,Trans}.pdf specs/libX11/libX11.pdf}
%attr(755,root,root) %{_libdir}/libX11.so
%{_libdir}/libX11.la
%{_includedir}/X11/ImUtil.h