rpms/gimp/devel gimp.spec,1.164,1.165

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15595

Modified Files:
	gimp.spec 
Log Message:
split off help browser plugin



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- gimp.spec	7 Oct 2008 14:31:50 -0000	1.164
+++ gimp.spec	8 Oct 2008 16:35:24 -0000	1.165
@@ -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 @@
 %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:  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 @@
 %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 @@
 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 @@
 prefer gutenprint over (external) gimp-print plugin:
                                           %{with gutenprint}
 %endif
-use internal webkit based help browser:   %{with webkit}
 
 
 EOF
@@ -197,14 +204,9 @@
 %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 @@
 #%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 @@
 %{_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 <nils at redhat.com> - 2:2.6.0-3
+- split off help browser plugin
+
 * Tue Oct 07 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.0-2
 - move gimptool to devel subpackage
 - make gimp-plugin-mgr not require gimptool/pkg-config (#465869)