Author: qboosh Date: Mon Nov 22 08:56:19 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated BRs
- dropped invalidated doc bcond (no longer necessary for bootstrap)
---- Files affected:
packages/xorg-lib-libX11:
xorg-lib-libX11.spec (1.69 -> 1.70)
---- Diffs:
================================================================
Index: packages/xorg-lib-libX11/xorg-lib-libX11.spec
diff -u packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.69
packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.70
--- packages/xorg-lib-libX11/xorg-lib-libX11.spec:1.69 Mon Nov 22 07:06:34 2010
+++ packages/xorg-lib-libX11/xorg-lib-libX11.spec Mon Nov 22 09:56:14 2010
@@ -2,7 +2,6 @@
#
# Conditional build:
%bcond_without static_libs # don't build static library
-%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
@@ -19,21 +18,18 @@
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: cpp
-%if %{with doc}
-# ps2pdf
-BuildRequires: ghostscript
-BuildRequires: groff
-%endif
BuildRequires: libtool
+BuildRequires: libxcb-devel >= 1.2
BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: xmlto >= 0.0.20
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.6
-BuildRequires: libxcb-devel >= 1.2
+BuildRequires: xorg-sgml-doctools >= 1.5
+BuildRequires: xorg-util-util-macros >= 1.11
Requires: libxcb >= 1.2
Obsoletes: libX11
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -102,8 +98,7 @@
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- pkgconfigdir=%{_pkgconfigdir}
+ DESTDIR=$RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libX11
@@ -114,7 +109,6 @@
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
@@ -214,17 +208,15 @@
%files devel
%defattr(644,root,root,755)
-# PDF chosen - docs include pictures
-%{?with_doc:%doc specs/rpm-doc/*}
+%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
-%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
%{_mandir}/man3/*.3x*
@@ -241,6 +233,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.70 2010/11/22 08:56:14 qboosh
+- updated BRs
+- dropped invalidated doc bcond (no longer necessary for bootstrap)
+
Revision 1.69 2010/11/22 06:06:34 arekm
- up to 1.4.0; xcb is no longer optional
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-lib-libX11/xorg-lib-libX11.spec?r1=1.69&r2=1.70&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
