From 9584217746c18a6508ba84e53fcaee5a6eb8b4028ddf573e8e0d6c17c185e38b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 9 Oct 2014 14:10:52 +0000 Subject: [PATCH] Accepting request 254858 from home:dimstar:branches:multimedia:libs Fix SLE OBS-URL: https://build.opensuse.org/request/show/254858 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/orc?expand=0&rev=46 --- orc.changes | 9 +++++++++ orc.spec | 16 +++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/orc.changes b/orc.changes index af5453f..f51d906 100644 --- a/orc.changes +++ b/orc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 9 13:53:25 UTC 2014 - dimstar@opensuse.org + +- Fix version dependency for gtk-doc (min 1.12). +- Disable building of gtk-doc for SLE11, where this version of + gtk-doc is not available (by means of bcond_with/without). + The pre-built documentation, as shipped in the tarball will be + installed in this case. + ------------------------------------------------------------------- Thu Oct 9 13:41:02 UTC 2014 - dimstar@opensuse.org diff --git a/orc.spec b/orc.spec index 27cc42a..c5aa9d7 100644 --- a/orc.spec +++ b/orc.spec @@ -17,6 +17,12 @@ # +%if 0%{?suse_version} < 1200 +%bcond_with gtkdoc +%else +%bcond_without gtkdoc +%endif + Name: orc Version: 0.4.22 Release: 0 @@ -26,7 +32,9 @@ Group: Productivity/Multimedia/Other Url: http://cgit.freedesktop.org/gstreamer/orc Source: http://gstreamer.freedesktop.org/src/orc/%{name}-%{version}.tar.xz Source99: baselibs.conf -BuildRequires: gtk-doc +%if %{with gtkdoc} +BuildRequires: gtk-doc >= 1.12 +%endif BuildRequires: pkg-config %if 0%{?suse_version} <= 1130 #openSUSE until 11.3 and also SLE11 do not bring in xz on their own. @@ -70,7 +78,11 @@ arithmetic operations. %build %configure \ --disable-static \ +%if %{with gtkdoc} --enable-gtk-doc +%else + --disable-gtk-doc +%endif make %{?_smp_mflags} %install @@ -103,6 +115,8 @@ make check %{?_smp_mflags} %files doc %defattr(-,root,root) +%dir /usr/share/gtk-doc +%dir /usr/share/gtk-doc/html %{_datadir}/gtk-doc/html/orc/ %files -n liborc-0_4-0