rpms/gimp/F-8 gimp-2.4.0-htmlview.patch, NONE, 1.1 gimp.spec, 1.145, 1.146 gimp-2.3.18-htmlview.patch, 1.1, NONE

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3111

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.4.0-htmlview.patch 
Removed Files:
	gimp-2.3.18-htmlview.patch 
Log Message:
use either htmlview or xdg-open in documentation instead of firefox (#355801)


gimp-2.4.0-htmlview.patch:

--- NEW FILE gimp-2.4.0-htmlview.patch ---
diff -up gimp-2.4.0/docs/gimprc.5.in.htmlview gimp-2.4.0/docs/gimprc.5.in
--- gimp-2.4.0/docs/gimprc.5.in.htmlview	2007-10-22 21:45:59.000000000 +0200
+++ gimp-2.4.0/docs/gimprc.5.in	2007-10-29 15:11:05.000000000 +0100
@@ -788,7 +788,7 @@ Sets the browser used by the help system
 web-browser.
 
 .TP
-(web-browser "firefox %s")
+(web-browser "htmlview %s")
 
 Sets the external web browser to be used.  This can be an absolute path or the
 name of an executable to search for in the user's PATH. If the command
diff -up gimp-2.4.0/etc/gimprc.htmlview gimp-2.4.0/etc/gimprc
--- gimp-2.4.0/etc/gimprc.htmlview	2007-10-22 21:45:59.000000000 +0200
+++ gimp-2.4.0/etc/gimprc	2007-10-29 15:00:33.000000000 +0100
@@ -625,7 +625,7 @@
 # appended to the command with a space separating the two.  This is a single
 # filename.
 # 
-# (web-browser "firefox %s")
+# (web-browser "htmlview %s")
 
 # The window type hint that is set on the toolbox. This may affect how your
 # window manager decorates and handles the toolbox window.  Possible values
diff -up gimp-2.4.0/app/config/gimpguiconfig.c.htmlview gimp-2.4.0/app/config/gimpguiconfig.c
--- gimp-2.4.0/app/config/gimpguiconfig.c.htmlview	2007-05-21 10:56:29.000000000 +0200
+++ gimp-2.4.0/app/config/gimpguiconfig.c	2007-10-29 15:00:33.000000000 +0100
@@ -40,7 +40,7 @@
 #ifdef G_OS_WIN32
 #  define DEFAULT_WEB_BROWSER      "not used on Windows"
 #else
-#  define DEFAULT_WEB_BROWSER      "firefox %s"
+#  define DEFAULT_WEB_BROWSER      "htmlview %s"
 #endif
 
 


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/F-8/gimp.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- gimp.spec	25 Oct 2007 12:06:51 -0000	1.145
+++ gimp.spec	29 Oct 2007 14:17:00 -0000	1.146
@@ -51,7 +51,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -121,7 +121,7 @@
 
 Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Source1:        gimp-plugin-mgr.in
-Patch0:         gimp-2.3.18-htmlview.patch
+Patch0:         gimp-2.4.0-htmlview.patch
 Patch1:         gimp-2.4.0-xdg-open.patch
 
 %description
@@ -161,13 +161,16 @@
 cat << EOF
 
 Build options:
-modular X:                    %_enable_modularX
-LCMS support:                 %_enable_lcms
-Python support:               %_enable_python
-MP support:                   %_enable_mp
-build static libs:            %_enable_static
-build internal print plugin:  %_enable_print
-include convenience symlinks: %_enable_convenience
+modular X:                                %_enable_modularX
+LCMS support:                             %_enable_lcms
+Python support:                           %_enable_python
+MP support:                               %_enable_mp
+build static libs:                        %_enable_static
+build internal print plugin:              %_enable_print
+include convenience symlinks:             %_enable_convenience
+build the print plugin:                   %_enable_print
+prefer gutenprint over gimp-print plugin: %_enable_gutenprint
+use xdg-open instead of htmlview:         %_enable_xdg_open
 
 
 EOF
@@ -439,6 +442,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Oct 29 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-4
+- use either htmlview or xdg-open in documentation instead of firefox (#355801)
+
 * Thu Oct 25 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-3
 - add epoch to obsoletes
 


--- gimp-2.3.18-htmlview.patch DELETED ---