- switched to multibuild for -doc package to avoid build cycles

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorgproto?expand=0&rev=28

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>doc</package>
+</multibuild>

xorgproto.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 31 10:27:53 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- switched to multibuild for -doc package to avoid build cycles
+
 -------------------------------------------------------------------
 Sun Jan 29 00:30:17 UTC 2023 - Christopher Yeleighton <giecrilj@stegny.2a.pl>
 

xorgproto.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package xorgproto
+# spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,45 @@
 #
 
 
-Name:           xorgproto
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "doc"
+%global psuffix -doc
+%else
+%global psuffix %{nil}
+%endif
+
+%define srcname xorgproto
+
+Name:           %{srcname}%{psuffix}
 Version:        2022.2
 Release:        0
+%if "%{flavor}" == "doc"
+Summary:        The X11 Protocol collection (documentation)
+%else
 Summary:        The X11 Protocol collection
+%endif
 License:        MIT
 Group:          Development/Libraries/X11
 URL:            https://xorg.freedesktop.org/
 #Git-Clone:	git://anongit.freedesktop.org/xorg/proto/xorgproto
 #Git-Web:	http://cgit.freedesktop.org/xorg/proto/xorgproto/
-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
+Source0:        https://xorg.freedesktop.org/releases/individual/proto/%{srcname}-%{version}.tar.xz
+Source1:        https://xorg.freedesktop.org/releases/individual/proto/%{srcname}-%{version}.tar.xz.sig
 Source2:        xorgproto.keyring
-BuildRequires:  pkgconfig xmlto fop xsltproc fdupes xorg-sgml-doctools
-BuildArch:  noarch
+BuildRequires:  fdupes
+BuildRequires:  pkgconfig
+%if "%{flavor}" == "doc"
+BuildRequires:  fop
+BuildRequires:  xmlto
+BuildRequires:  xorg-sgml-doctools
+BuildRequires:  xsltproc
+%endif
+BuildArch:      noarch
+
+%if "%{flavor}" == "doc"
+%description
+Documentation for X11 protocol headers.
+%else
 
 %description
 The X11 protocol headers for X11 development.
@@ -40,6 +65,7 @@ randrproto, recordproto, renderproto, resourceproto, scrnsaverproto, trapproto,
 videoproto, windowswmproto, xcmiscproto, xextproto, xf86bigfontproto,
 xf86dgaproto, xf86driproto, xf86miscproto, xf86vidmodeproto, xineramaproto,
 xproto and xproxymngproto.
+%endif
 
 %package devel
 Summary:        The X11 Protocol collection
@@ -120,10 +146,9 @@ xf86dgaproto, xf86driproto, xf86miscproto, xf86vidmodeproto, xineramaproto,
 xproto and xproxymngproto.
 
 %prep
-%setup -q
+%setup -q -n %{srcname}-%{version}
 
 %build
-#autoreconf -fi
 %if (0%{?suse_version} < 1550)
 %configure --enable-legacy
 %else
@@ -137,9 +162,18 @@ xproto and xproxymngproto.
 %endif
 %fdupes '%{buildroot}%{_datadir}'
 
+%if "%{flavor}" == "doc"
+%files
+%doc %{_datadir}/doc/*
+%{nil <URL: https://bugzilla.opensuse.org/show_bug.cgi?id=1207721#c15> }
+%exclude %{_datadir}/doc/*/*.{pdf,xml,ps,db}
+%exclude %{_includedir}
+%exclude %{_datarootdir}/pkgconfig
+%else
+
 %files devel
 %license COPYING-*
-%doc %{_datadir}/doc/*
+%exclude %{_datadir}/doc
 %dir %{_includedir}/GL
 %{_includedir}/GL/*.h
 %{_includedir}/GL/internal
@@ -148,7 +182,6 @@ xproto and xproxymngproto.
 %{_datarootdir}/pkgconfig/*.pc
 # we seriously don't want to package that again ...
 %exclude %{_mandir}/man7/Xprint.7
-%{nil <URL: https://bugzilla.opensuse.org/show_bug.cgi?id=1207721#c15> }
-%exclude %{_datadir}/doc/*/*.{pdf,xml,ps,db}
+%endif
 
 %changelog