# Conditional build:
%bcond_without static_libs # don't build static library
%bcond_without xcb # XCB for low-level protocol implementation
+%bcond_without doc # don't package devel docs (allows bootstrapping)
#
-Summary: X11 Base library
-Summary(pl.UTF-8): Podstawowa biblioteka X11
+Summary: Core X11 protocol client library
+Summary(pl.UTF-8): Podstawowa biblioteka kliencka protokołu X11
Name: xorg-lib-libX11
-Version: 1.1.99.2
+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: 2450f861d39939e46f8a4ced1abc3504
+# Source0-md5: 8e0a8a466aa78f66e09fe06cb395319f
+# sync locales and their encodings with glibc
Patch0: %{name}-glibc-locale_sync.patch
URL: http://xorg.freedesktop.org/
-BuildRequires: autoconf >= 2.57
+BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: cpp
+%if %{with doc}
+# ps2pdf
+BuildRequires: ghostscript
+BuildRequires: groff
+%endif
BuildRequires: libtool
-%{?with_xcb:BuildRequires: libxcb-devel >= 1.1.92}
BuildRequires: pkgconfig >= 1:0.19
-BuildRequires: xorg-proto-bigreqsproto-devel
+BuildRequires: xorg-lib-xtrans-devel
BuildRequires: xorg-proto-inputproto-devel
BuildRequires: xorg-proto-kbproto-devel
-BuildRequires: xorg-proto-xcmiscproto-devel
BuildRequires: xorg-proto-xextproto-devel
BuildRequires: xorg-proto-xf86bigfontproto-devel
-BuildRequires: xorg-proto-xproto-devel >= 7.0.6
-BuildRequires: xorg-lib-libXdmcp-devel
+BuildRequires: xorg-proto-xproto-devel >= 7.0.13
+BuildRequires: xorg-util-util-macros >= 1.6
+%if %{with xcb}
+BuildRequires: libxcb-devel >= 1.2
+%else
BuildRequires: xorg-lib-libXau-devel
-BuildRequires: xorg-lib-xtrans-devel
-BuildRequires: xorg-util-util-macros >= 1.1.0
-%{?with_xcb:Requires: libxcb >= 1.1.92}
-Obsoletes: libX11
+BuildRequires: xorg-lib-libXdmcp-devel
+BuildRequires: xorg-proto-bigreqsproto-devel
+BuildRequires: xorg-proto-xcmiscproto-devel
+%endif
+Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-X11 Base library.
+Core X11 protocol client library.
%description -l pl.UTF-8
-Podstawowa biblioteka X11.
+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
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
-%{?with_xcb:Requires: libxcb-devel >= 1.1.92}
+Requires: xorg-proto-kbproto-devel
+Requires: xorg-proto-xproto-devel >= 7.0.13
+%if %{with xcb}
+Requires: libxcb-devel >= 1.2
+%else
Requires: xorg-lib-libXau-devel
Requires: xorg-lib-libXdmcp-devel
-Requires: xorg-proto-kbproto-devel
-Requires: xorg-proto-xproto-devel >= 7.0.6
+%endif
Obsoletes: libX11-devel
%description devel
-X11 Base library.
+Core X11 protocol client library.
This package contains the header files needed to develop programs that
use libX11.
%description devel -l pl.UTF-8
-Podstawowa biblioteka X11.
+Podstawowa biblioteka kliencka protokołu X11.
Pakiet zawiera pliki nagłówkowe niezbędne do kompilowania programów
używających biblioteki libX11.
Obsoletes: libX11-static
%description static
-X11 Base library.
+Core X11 protocol client library.
This package contains the static libX11 library.
%description static -l pl.UTF-8
-Podstawowa biblioteka X11.
+Podstawowa biblioteka kliencka protokołu X11.
Pakiet zawiera statyczną bibliotekę libX11.
%build
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
pkgconfigdir=%{_pkgconfigdir}
-
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libX11
+
%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 libs
+# this needs to be a dir
+if [ -L %{_libdir}/X11 ]; then
+ umask 022
+ mv -f %{_libdir}/X11{,.rpmsave}
+ mkdir %{_libdir}/X11
+fi
%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog README
+%dir %{_datadir}/X11
+%{_datadir}/X11/XErrorDB
+%dir %{_datadir}/X11/locale
+%{_datadir}/X11/locale/compose.dir
+%{_datadir}/X11/locale/locale.alias
+%{_datadir}/X11/locale/locale.dir
+%{_datadir}/X11/locale/C
+%{_datadir}/X11/locale/en_US.UTF-8
+
+# encodings, not really lang taggable
+%{_datadir}/X11/locale/armscii-8
+%{_datadir}/X11/locale/georgian-academy
+%{_datadir}/X11/locale/georgian-ps
+%{_datadir}/X11/locale/ibm-cp1133
+%{_datadir}/X11/locale/iscii-dev
+%{_datadir}/X11/locale/isiri-3342
+%{_datadir}/X11/locale/iso8859-1
+%{_datadir}/X11/locale/iso8859-10
+%{_datadir}/X11/locale/iso8859-11
+%{_datadir}/X11/locale/iso8859-13
+%{_datadir}/X11/locale/iso8859-14
+%{_datadir}/X11/locale/iso8859-15
+%{_datadir}/X11/locale/iso8859-16
+%{_datadir}/X11/locale/iso8859-2
+%{_datadir}/X11/locale/iso8859-3
+%{_datadir}/X11/locale/iso8859-4
+%{_datadir}/X11/locale/iso8859-5
+%{_datadir}/X11/locale/iso8859-6
+%{_datadir}/X11/locale/iso8859-7
+%{_datadir}/X11/locale/iso8859-8
+%{_datadir}/X11/locale/iso8859-9
+%{_datadir}/X11/locale/iso8859-9e
+%{_datadir}/X11/locale/koi8-c
+%{_datadir}/X11/locale/koi8-r
+%{_datadir}/X11/locale/koi8-t
+%{_datadir}/X11/locale/koi8-u
+%{_datadir}/X11/locale/microsoft-cp1251
+%{_datadir}/X11/locale/microsoft-cp1255
+%{_datadir}/X11/locale/microsoft-cp1256
+%{_datadir}/X11/locale/mulelao-1
+%{_datadir}/X11/locale/nokhchi-1
+%{_datadir}/X11/locale/tatar-cyr
+%{_datadir}/X11/locale/tscii-0
+
+%lang(am) %{_datadir}/X11/locale/am_ET.UTF-8
+%lang(el) %{_datadir}/X11/locale/el_GR.UTF-8
+%lang(fi) %{_datadir}/X11/locale/fi_FI.UTF-8
+%lang(ja) %{_datadir}/X11/locale/ja
+%lang(ja) %{_datadir}/X11/locale/ja.JIS
+%lang(ja) %{_datadir}/X11/locale/ja.S90
+%lang(ja) %{_datadir}/X11/locale/ja.SJIS
+%lang(ja) %{_datadir}/X11/locale/ja.U90
+%lang(ja) %{_datadir}/X11/locale/ja_JP.UTF-8
+%lang(ko) %{_datadir}/X11/locale/ko
+%lang(ko) %{_datadir}/X11/locale/ko_KR.UTF-8
+%lang(pt_BR) %{_datadir}/X11/locale/pt_BR.UTF-8
+%lang(ru) %{_datadir}/X11/locale/ru_RU.UTF-8
+%lang(th) %{_datadir}/X11/locale/th_TH
+%lang(th) %{_datadir}/X11/locale/th_TH.UTF-8
+%lang(vi) %{_datadir}/X11/locale/vi_VN.tcvn
+%lang(vi) %{_datadir}/X11/locale/vi_VN.viscii
+%lang(zh_CN) %{_datadir}/X11/locale/zh_CN
+%lang(zh_CN) %{_datadir}/X11/locale/zh_CN.UTF-8
+%lang(zh_CN) %{_datadir}/X11/locale/zh_CN.gb18030
+%lang(zh_CN) %{_datadir}/X11/locale/zh_CN.gbk
+%lang(zh_HK) %{_datadir}/X11/locale/zh_HK.UTF-8
+%lang(zh_HK) %{_datadir}/X11/locale/zh_HK.big5
+%lang(zh_HK) %{_datadir}/X11/locale/zh_HK.big5hkscs
+%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}
%endif
%dir %{_libdir}/X11
%{_libdir}/X11/Xcms.txt
-%dir %{_datadir}/X11
-%{_datadir}/X11/XErrorDB
-%{_datadir}/X11/XKeysymDB
-%{_datadir}/X11/locale
%files devel
%defattr(644,root,root,755)
+# PDF chosen - docs include pictures
+%{?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/*.h
+%{_includedir}/X11/ImUtil.h
+%{_includedir}/X11/X*.h
+%{_includedir}/X11/cursorfont.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)
+#%{_includedir}/X11/Xlib-xcb.h (already included in X*.h above)
%{_pkgconfigdir}/x11-xcb.pc
%endif
%{_mandir}/man3/*.3x*
projects / packages / xorg-lib-libX11.git / blobdiff