- rel 2

[packages/xorg-lib-libX11.git] / xorg-lib-libX11.spec

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 0a98435c21ccf6b695a4458ea505d85a966bd352..ea50d5024c656f99a351e2fca696d17aa5e8d950 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -2,22 +2,28 @@
 # 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:       Core X11 protocol client library
 Summary(pl.UTF-8):     Podstawowa biblioteka kliencka protokołu X11
 Name:          xorg-lib-libX11
-Version:       1.3
-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: 0545089013213e90aac19b8f8045d32e
-# how this patch is being made?
+# 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 doc}
+# ps2pdf
+BuildRequires: ghostscript
+BuildRequires: groff
+%endif
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.19
 BuildRequires: xorg-lib-xtrans-devel
@@ -26,7 +32,7 @@ BuildRequires:        xorg-proto-kbproto-devel
 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
@@ -35,8 +41,7 @@ BuildRequires:        xorg-lib-libXdmcp-devel
 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
@@ -45,6 +50,20 @@ Core X11 protocol client library.
 %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
@@ -91,11 +110,11 @@ Pakiet zawiera statyczną bibliotekę libX11.
 
 %prep
 %setup -q -n libX11-%{version}
-#%patch0 -p1
+%patch0 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -112,13 +131,15 @@ rm -rf $RPM_BUILD_ROOT
        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
+%pretrans libs
 # this needs to be a dir
 if [ -L %{_libdir}/X11 ]; then
        umask 022
@@ -129,17 +150,8 @@ fi
 %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
@@ -160,6 +172,7 @@ fi
 %{_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
@@ -171,6 +184,7 @@ fi
 %{_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
@@ -207,9 +221,23 @@ fi
 %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_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