From 6ef0e17ea256b86bd6c71b0c6c791c279a16c3ef Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Oct 20 2012 12:48:09 +0000 Subject: don't build help browser on EL --- diff --git a/gimp.spec b/gimp.spec index 2662ccc..66e013c 100644 --- a/gimp.spec +++ b/gimp.spec @@ -40,6 +40,12 @@ %else %bcond_with poppler %endif +# helpbrowser build webkit-based help browser +%if 0%{?rhel} +%bcond_with helpbrowser +%else +%bcond_without helpbrowser +%endif # Set this to 0 in stable, 1 in (SONAME-wise) unstable releases @@ -147,11 +153,13 @@ BuildRequires: poppler-glib-devel >= 0.20.0 BuildRequires: python-devel BuildRequires: pygtk2-devel >= 2.10.4 BuildRequires: pygobject2-devel +%if %{with helpbrowser} %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 10 || 0%{?rhel} > 5 BuildRequires: webkitgtk-devel >= 1.6.1 %else BuildRequires: WebKit-gtk-devel >= 1.6.1 %endif +%endif BuildRequires: zlib-devel BuildRequires: libX11-devel BuildRequires: libXmu-devel @@ -179,6 +187,9 @@ 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} +%endif Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{dashprerel}.tar.bz2 @@ -229,6 +240,7 @@ Requires: gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release} The gimp-devel-tools package contains gimptool, a helper program to build GNU Image Manipulation Program (GIMP) plug-ins and extensions. +%if %{with helpbrowser} %package help-browser Summary: GIMP help browser plug-in Group: Applications/Multimedia @@ -239,6 +251,7 @@ Requires: gimp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description help-browser The gimp-help-browser package contains a lightweight help browser plugin for viewing GIMP online help. +%endif %prep cat << EOF @@ -258,6 +271,7 @@ prefer gutenprint over (external) gimp-print plugin: build ASCII art plugin %{with aalib} harden binaries: %{with hardening} use poppler: %{with poppler} +build help browser: %{with helpbrowser} --- >8 --------------------------------------------------------------------- EOF @@ -325,9 +339,14 @@ export LDFLAGS='-pie' %else --without-poppler \ %endif +%if %{with helpbrowser} + --with-webkit \ +%else + --without-webkit \ +%endif --with-libtiff --with-libjpeg --with-libpng --with-libmng --with-libjasper \ --with-libexif --with-librsvg --with-libxpm --with-gvfs --with-alsa \ - --with-webkit --with-dbus --with-script-fu --with-cairo-pdf + --with-dbus --with-script-fu --with-cairo-pdf make %{?_smp_mflags} @@ -536,13 +555,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/gimptool.1* %endif +%if %{with helpbrowser} %files help-browser %defattr (-, root, root, 0755) %{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser +%endif %changelog * Sat Oct 20 2012 Nils Philippsen - 2:2.8.2-2 - run "make check" +- don't build help browser on EL * Fri Aug 24 2012 Nils Philippsen - 2:2.8.2-1 - version 2.8.2