From ecccc27bf140744c90c4061138d9512145df0313871540741fd3b5bf1ad29f5c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 29 Jan 2023 10:15:31 +0000 Subject: [PATCH] Accepting request 1061849 from home:yecril71pl:branches:X11:XOrg - Build documentation (boo#1207721) OBS-URL: https://build.opensuse.org/request/show/1061849 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorgproto?expand=0&rev=27 --- xorgproto.changes | 5 +++++ xorgproto.spec | 43 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/xorgproto.changes b/xorgproto.changes index 63774e8..114c4e5 100644 --- a/xorgproto.changes +++ b/xorgproto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 29 00:30:17 UTC 2023 - Christopher Yeleighton + +- Build documentation (boo#1207721) + ------------------------------------------------------------------- Sun Aug 21 11:15:11 UTC 2022 - Bjørn Lie diff --git a/xorgproto.spec b/xorgproto.spec index 6f9bedd..075177e 100644 --- a/xorgproto.spec +++ b/xorgproto.spec @@ -28,7 +28,8 @@ URL: https://xorg.freedesktop.org/ Source0: https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.tar.xz Source1: https://xorg.freedesktop.org/releases/individual/proto/%{name}-%{version}.tar.xz.sig Source2: xorgproto.keyring -BuildRequires: pkgconfig +BuildRequires: pkgconfig xmlto fop xsltproc fdupes xorg-sgml-doctools +BuildArch: noarch %description The X11 protocol headers for X11 development. @@ -46,36 +47,67 @@ Group: Development/Libraries/X11 Obsoletes: xorgproto-devel < %{version} # the next is for obsoleting applewmproto <= 1.4.2 Obsoletes: bigreqsproto-devel <= 1.1.2 +Provides: bigreqsproto-devel = %{version} Obsoletes: compositeproto-devel <= 0.4.2 +Provides: compositeproto-devel = %{version} Obsoletes: damageproto-devel <= 1.2.1 +Provides: damageproto-devel = %{version} Obsoletes: dmxproto-devel <= 2.3.1 +Provides: dmxproto-devel = %{version} Obsoletes: dri2proto-devel <= 2.8 +Provides: dri2proto-devel = %{version} Obsoletes: dri3proto-devel <= 1.2 +Provides: dri3proto-devel = %{version} Obsoletes: fixesproto-devel <= 5.0 +Provides: fixesproto-devel = %{version} Obsoletes: fontsproto-devel <= 2.1.3 +Provides: fontsproto-devel = %{version} Obsoletes: glproto-devel <= 1.4.17 +Provides: glproto-devel = %{version} Obsoletes: inputproto-devel <= 2.3.2 +Provides: inputproto-devel = %{version} Obsoletes: kbproto-devel <= 1.0.7 +Provides: kbproto-devel = %{version} Obsoletes: presentproto-devel <= 1.2 +Provides: presentproto-devel = %{version} Obsoletes: randrproto-devel <= 1.6.0 +Provides: randrproto-devel = %{version} Obsoletes: recordproto-devel <= 1.14.2 +Provides: recordproto-devel = %{version} Obsoletes: renderproto-devel <= 0.11.1 +Provides: renderproto-devel = %{version} Obsoletes: resourceproto-devel <= 1.2.0 +Provides: resourceproto-devel = %{version} +Provides: scrnsaverproto-devel = %{version} Obsoletes: scrnsaverproto-devel <= 1.2.2 +Provides: trapproto-devel = %{version} Obsoletes: trapproto-devel <= 3.4.3 +Provides: videoproto-devel = %{version} Obsoletes: videoproto-devel <= 2.3.3 +Provides: windowswmproto-devel = %{version} Obsoletes: windowswmproto-devel <= 1.0.4 +Provides: xcmiscproto-devel = %{version} Obsoletes: xcmiscproto-devel <= 1.2.2 +Provides: xextproto-devel = %{version} Obsoletes: xextproto-devel <= 7.3.0 +Provides: xf86bigfontproto-devel = %{version} Obsoletes: xf86bigfontproto-devel <= 1.2.0 +Provides: xf86dgaproto-devel = %{version} Obsoletes: xf86dgaproto-devel <= 2.1 +Provides: xf86driproto-devel = %{version} Obsoletes: xf86driproto-devel <= 2.1.1 +Provides: xf86miscproto-devel = %{version} Obsoletes: xf86miscproto-devel <= 0.9.3 +Provides: xf86vidmodeproto-devel = %{version} Obsoletes: xf86vidmodeproto-devel <= 2.3.1 +Provides: xineramaproto-devel = %{version} Obsoletes: xineramaproto-devel <= 1.2.1 -Obsoletes: xorg-x11-proto-devel +Obsoletes: xorg-x11-proto-devel < %{version} +Provides: xorg-x11-proto-devel = %{version} Obsoletes: xproto-devel <= 7.0.32 +Provides: xproto-devel = %{version} Obsoletes: xproxymngproto-devel <= 1.0.3 +Provides: xproxymngproto-devel = %{version} %description devel The complete X11 protocol headers for X11 development. @@ -102,9 +134,8 @@ xproto and xproxymngproto. %install %make_install %if (0%{?suse_version} < 1550) -# we seriously don't want to package that again ... -rm %{buildroot}%{_mandir}/man7/Xprint.7 %endif +%fdupes '%{buildroot}%{_datadir}' %files devel %license COPYING-* @@ -115,5 +146,9 @@ rm %{buildroot}%{_mandir}/man7/Xprint.7 %{_includedir}/X11/{dri,extensions,fonts} %{_includedir}/X11/*.h %{_datarootdir}/pkgconfig/*.pc +# we seriously don't want to package that again ... +%exclude %{_mandir}/man7/Xprint.7 +%{nil } +%exclude %{_datadir}/doc/*/*.{pdf,xml,ps,db} %changelog