- try fix multilib verify problems

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

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 695e6eed2058c30fbcd88909add58dac53cbf594..8a89acd8bbcf88ff071f060a26706c504ced0df9 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -1,47 +1,35 @@
 #
 # 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)
 #
 Summary:       Core X11 protocol client library
 Summary(pl.UTF-8):     Podstawowa biblioteka kliencka protokołu X11
 Name:          xorg-lib-libX11
-Version:       1.3.2
-Release:       1
+Version:       1.4.4
+Release:       2
 License:       MIT
 Group:         X11/Libraries
 Source0:       http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: 001d780829f936e34851ef7cd37b4dfd
+# Source0-md5: ed7c382cbf8c13425b6a66bcac0ca5d9
 # 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}
-# ps2pdf
-BuildRequires: ghostscript
-BuildRequires: groff
-%endif
 BuildRequires: libtool
+BuildRequires: libxcb-devel >= 1.2
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: xmlto >= 0.0.22
 BuildRequires: xorg-lib-xtrans-devel
 BuildRequires: xorg-proto-inputproto-devel
 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
-%if %{with xcb}
-BuildRequires: libxcb-devel >= 1.2
-%else
-BuildRequires: xorg-lib-libXau-devel
-BuildRequires: xorg-lib-libXdmcp-devel
-BuildRequires: xorg-proto-bigreqsproto-devel
-BuildRequires: xorg-proto-xcmiscproto-devel
-%endif
-%{?with_xcb:Requires:  libxcb >= 1.2}
+BuildRequires: xorg-proto-xf86bigfontproto-devel >= 1.2.0
+BuildRequires: xorg-proto-xproto-devel >= 7.0.21
+BuildRequires: xorg-sgml-doctools >= 1.8
+BuildRequires: xorg-util-util-macros >= 1.15
+Requires:      libxcb >= 1.2
 Obsoletes:     libX11
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -57,13 +45,8 @@ Summary(pl.UTF-8):   Pliki nagłówkowe biblioteki libX11
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      xorg-proto-kbproto-devel
-Requires:      xorg-proto-xproto-devel >= 7.0.13
-%if %{with xcb}
+Requires:      xorg-proto-xproto-devel >= 7.0.21
 Requires:      libxcb-devel >= 1.2
-%else
-Requires:      xorg-lib-libXau-devel
-Requires:      xorg-lib-libXdmcp-devel
-%endif
 Obsoletes:     libX11-devel
 
 %description devel
@@ -101,25 +84,31 @@ Pakiet zawiera statyczną bibliotekę libX11.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_static_libs:--disable-static} \
-       %{!?with_xcb:--without-xcb}
+       %{!?with_static_libs:--disable-static}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir}
+       INSTALL="install -p" \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libX11
 
+cd specs
+for dir in XIM i18n/framework i18n/localedb i18n/trans libX11; do
+       install -d rpm-doc/$dir
+       cp -a $dir/*.html rpm-doc/$dir
+       cp -a $dir/*.svg rpm-doc/$dir || :
+       sed -i -e "s#$RPM_BUILD_ROOT##g" rpm-doc/$dir/*.html
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -139,15 +128,12 @@ fi
 %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
@@ -217,31 +203,25 @@ 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*
+%{_mandir}/man5/*Compose.5x*
 
 %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}
+%doc specs/rpm-doc/*
 %attr(755,root,root) %{_libdir}/libX11.so
+%attr(755,root,root) %{_libdir}/libX11-xcb.so
 %{_libdir}/libX11.la
+%{_libdir}/libX11-xcb.la
 %{_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 X*.h above)
 %{_pkgconfigdir}/x11-xcb.pc
-%endif
 %{_mandir}/man3/*.3x*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libX11.a
-%if %{with xcb}
 %{_libdir}/libX11-xcb.a
 %endif
-%endif