From cdbc4f76a01e9b7c3bf83d9db9a6b1f14fea2a27 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 25 Oct 2016 17:54:16 +0200 Subject: [PATCH] build without help-browser from Fedora 26 on (#1375809) --- gimp.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gimp.spec b/gimp.spec index 9c22657..5aa2fd2 100644 --- a/gimp.spec +++ b/gimp.spec @@ -41,7 +41,7 @@ %bcond_with poppler %endif # helpbrowser build webkit-based help browser -%if 0%{?rhel} +%if 0%{?rhel} || 0%{?fedora} >= 26 %bcond_with helpbrowser %else %bcond_without helpbrowser @@ -191,6 +191,10 @@ Requires: hicolor-icon-theme Requires: pygtk2 >= 2.10.4 Requires: xdg-utils Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%if ! %{with helpbrowser} +Obsoletes: gimp-help-browser < %{?epoch:%{epoch}:}%{version}-%{release} +Conflicts: gimp-help-browser < %{?epoch:%{epoch}:}%{version}-%{release} +%endif Source0: http://download.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{dashprerel}.tar.bz2 @@ -652,6 +656,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Tue Oct 25 2016 Nils Philippsen +- build without help-browser from Fedora 26 on (#1375809) + * Sat Jul 16 2016 Nils Philippsen - 2:2.8.18-1 - version 2.8.18