From bf3cc66d728120b94f5e15577e3d937e1cdbacd3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 8 Oct 2008 16:35:24 +0000 Subject: [PATCH] split off help browser plugin --- gimp.spec | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/gimp.spec b/gimp.spec index 1decaf4..12a4b51 100644 --- a/gimp.spec +++ b/gimp.spec @@ -19,8 +19,6 @@ %bcond_without gutenprint # convenience: install convenience symlinks %bcond_without convenience -# webkit: use internal WebKit based help browser -%bcond_without webkit Summary: GNU Image Manipulation Program Name: gimp @@ -31,7 +29,7 @@ Version: 2.6.0 %define age 0 %define minorver 600 %define microver %(ver=%{version}; echo ${ver##*.*.}) -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 License: GPLv2+ Group: Applications/Multimedia @@ -66,9 +64,7 @@ BuildRequires: poppler-devel >= 0.4.1 BuildRequires: python-devel BuildRequires: pygtk2-devel >= 2.10.4 BuildRequires: pygobject2-devel -%if %{with webkit} BuildRequires: WebKit-gtk-devel >= 1.0.0 -%endif %if %{with modular_x} BuildRequires: libX11-devel BuildRequires: libXmu-devel @@ -98,6 +94,8 @@ Requires: gimp-print-plugin %endif Requires: hicolor-icon-theme Requires: xdg-utils +Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: gimp-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2 Source1: gimp-plugin-mgr.in @@ -136,6 +134,16 @@ The gimp-devel package contains the static libraries and header files for writing GNU Image Manipulation Program (GIMP) plug-ins and extensions. +%package help-browser +Summary: GIMP help browser plug-in +Group: Applications/Multimedia +License: GPLv2+ +Requires: gimp-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description help-browser +The gimp-help-browser package contains a lightweight help browser plugin for +viewing GIMP online help. + %prep cat << EOF @@ -152,7 +160,6 @@ build the print plugin: %{with print} prefer gutenprint over (external) gimp-print plugin: %{with gutenprint} %endif -use internal webkit based help browser: %{with webkit} EOF @@ -196,15 +203,10 @@ fi --without-aa \ %ifos linux --with-linux-input \ -%endif -%if %{with webkit} - --with-webkit \ -%else - --without-webkit \ %endif --with-libtiff --with-libjpeg --with-libpng --with-libmng --with-libexif \ --with-gtkhtml2 --with-librsvg --with-poppler --with-gnomevfs --with-alsa \ - --with-dbus --with-script-fu + --with-webkit --with-dbus --with-script-fu make %{?_smp_mflags} @@ -329,6 +331,7 @@ fi #%dir %{_libdir}/gimp/%{interfacever}/fonts %dir %{_libdir}/gimp/%{interfacever}/modules %dir %{_libdir}/gimp/%{interfacever}/plug-ins +%exclude %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser %dir %{_libdir}/gimp/%{interfacever}/python #%dir %{_libdir}/gimp/%{interfacever}/tool-plug-ins @@ -433,7 +436,14 @@ fi %{_includedir}/gimp-%{interfacever} %{_libdir}/pkgconfig/* +%files help-browser +%defattr (-, root, root, 0755) +%{_libdir}/gimp/%{interfacever}/plug-ins/help-browser + %changelog +* Wed Oct 08 2008 Nils Philippsen - 2:2.6.0-3 +- split off help browser plugin + * Tue Oct 07 2008 Nils Philippsen - 2:2.6.0-2 - move gimptool to devel subpackage - make gimp-plugin-mgr not require gimptool/pkg-config (#465869)