Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at 2017-10-31 15:44:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/midori (Old) and /work/SRC/openSUSE:Factory/.midori.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "midori" Tue Oct 31 15:44:31 2017 rev:48 rq:537739 version:0.5.11 Changes: -------- --- /work/SRC/openSUSE:Factory/midori/midori.changes 2017-08-22 11:10:25.613630881 +0200 +++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes 2017-10-31 15:44:31.868618848 +0100 @@ -1,0 +2,5 @@ +Mon Oct 30 19:25:17 UTC 2017 - okurz@suse.com + +- Fix build error on openSUSE:Factory by disabling gtk-doc dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.qQLnq6/_old 2017-10-31 15:44:32.704588544 +0100 +++ /var/tmp/diff_new_pack.qQLnq6/_new 2017-10-31 15:44:32.708588399 +0100 @@ -51,7 +51,11 @@ BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gthread-2.0) +# using deprecated/obsoleted gtkdoc-mktmpl - in this case, the easiest (until +# upstream might fix it) is to disable building the developer doc +%if 0%{?suse_version} < 1320 BuildRequires: pkgconfig(gtk-doc) +%endif BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) @@ -141,7 +145,9 @@ %build %cmake \ +%if 0%{?suse_version} < 1320 -DUSE_APIDOCS=ON \ +%endif %if 0%{?with_granite} -DUSE_GRANITE=ON \ %else @@ -228,7 +234,9 @@ %files devel %defattr(-,root,root,-) %doc HACKING TODO TRANSLATE +%if 0%{?suse_version} < 1320 %doc %{_datadir}/gtk-doc/html/%{name}-0-5/ +%endif %{_includedir}/midori-0.5/ %{_libdir}/libmidori-core.so
participants (1)
-
root@hilbert.suse.de