From b16038b673dad92385e336789f0ea154bb03d6b23a35d4fa77a6f555cabdcc19 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 4 Sep 2017 20:39:05 +0000 Subject: [PATCH] Accepting request 520846 from home:dimstar:Factory No gtk-doc, fails with 1.26 - Needed for Staging:G OBS-URL: https://build.opensuse.org/request/show/520846 OBS-URL: https://build.opensuse.org/package/show/X11:Unity/libappindicator?expand=0&rev=12 --- libappindicator.changes | 10 ++++++++++ libappindicator.spec | 10 ++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libappindicator.changes b/libappindicator.changes index 8f8ba0f..5a91ed3 100644 --- a/libappindicator.changes +++ b/libappindicator.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 4 16:06:31 UTC 2017 - dimstar@opensuse.org + +- Disable building of -doc subpackage (source not compatible with + gtk-doc 1.26 - and the doc is available online anyway): + + Remove gtk-doc BuildRequires. + + Replace --enable-gtk-doc configure parameter with + --disable-gtk-doc, + + Drop the -doc subpackage. + ------------------------------------------------------------------- Fri Apr 28 16:04:54 UTC 2017 - jengelh@inai.de diff --git a/libappindicator.spec b/libappindicator.spec index 0fab04c..d6c88d2 100644 --- a/libappindicator.spec +++ b/libappindicator.spec @@ -26,7 +26,7 @@ Name: libappindicator Version: 12.10.1+bzr20170215 Release: 0 Summary: Application indicators library -License: LGPL-2.0 and LGPL-3.0 and GPL-3.0 +License: LGPL-2.0 AND LGPL-3.0 AND GPL-3.0 Group: System/Libraries Url: https://launchpad.net/libappindicator Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz @@ -36,7 +36,6 @@ Patch0: 0001_Fix_mono_dir.patch Patch1: libappindicator-activate-support.patch BuildRequires: fdupes BuildRequires: gnome-common -BuildRequires: gtk-doc BuildRequires: pkgconfig BuildRequires: vala BuildRequires: pkgconfig(dbus-glib-1) @@ -170,7 +169,7 @@ for ver in 2 3; do pushd build-gtk$ver %configure \ --disable-static \ - --enable-gtk-doc \ + --disable-gtk-doc \ --disable-mono-test \ --with-gtk=$ver make -j1 V=1 @@ -246,11 +245,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/vala/vapi/appindicator3-0.1.vapi %{_datadir}/vala/vapi/appindicator3-0.1.deps -%files doc -%defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README -%doc %{_datadir}/gtk-doc/html/libappindicator/ - %if %{with mono} %files -n appindicator-sharp %defattr(-,root,root)