use either htmlview or xdg-open in documentation instead of firefox

(#355801)
This commit is contained in:
Nils Philippsen 2007-10-29 14:13:48 +00:00
parent d94f3acf4a
commit fb64c84c7d
4 changed files with 73 additions and 41 deletions

View File

@ -1,22 +0,0 @@
--- gimp-2.3.18/etc/gimprc.htmlview 2007-06-11 22:40:08.000000000 +0200
+++ gimp-2.3.18/etc/gimprc 2007-06-25 16:14:06.000000000 +0200
@@ -618,7 +618,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
--- gimp-2.3.18/app/config/gimpguiconfig.c.htmlview 2007-05-21 10:56:29.000000000 +0200
+++ gimp-2.3.18/app/config/gimpguiconfig.c 2007-06-25 16:13:28.000000000 +0200
@@ -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

36
gimp-2.4.0-htmlview.patch Normal file
View File

@ -0,0 +1,36 @@
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

View File

@ -1,18 +1,18 @@
diff -up gimp-2.4.0/app/config/gimpguiconfig.c.xdg-open gimp-2.4.0/app/config/gimpguiconfig.c
--- gimp-2.4.0/app/config/gimpguiconfig.c.xdg-open 2007-05-21 10:56:29.000000000 +0200
+++ gimp-2.4.0/app/config/gimpguiconfig.c 2007-10-24 10:43:49.000000000 +0200
@@ -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 "xdg-open %s"
#endif
diff -up gimp-2.4.0/docs/gimprc.5.in.xdg-open gimp-2.4.0/docs/gimprc.5.in
--- gimp-2.4.0/docs/gimprc.5.in.xdg-open 2007-10-22 21:45:59.000000000 +0200
+++ gimp-2.4.0/docs/gimprc.5.in 2007-10-29 14:53:34.000000000 +0100
@@ -788,7 +788,7 @@ Sets the browser used by the help system
web-browser.
.TP
-(web-browser "firefox %s")
+(web-browser "xdg-open %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.xdg-open gimp-2.4.0/etc/gimprc
--- gimp-2.4.0/etc/gimprc.xdg-open 2007-10-22 21:45:59.000000000 +0200
+++ gimp-2.4.0/etc/gimprc 2007-10-24 10:43:58.000000000 +0200
+++ gimp-2.4.0/etc/gimprc 2007-10-29 14:37:49.000000000 +0100
@@ -625,7 +625,7 @@
# appended to the command with a space separating the two. This is a single
# filename.
@ -22,3 +22,15 @@ diff -up gimp-2.4.0/etc/gimprc.xdg-open gimp-2.4.0/etc/gimprc
# 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.xdg-open gimp-2.4.0/app/config/gimpguiconfig.c
--- gimp-2.4.0/app/config/gimpguiconfig.c.xdg-open 2007-05-21 10:56:29.000000000 +0200
+++ gimp-2.4.0/app/config/gimpguiconfig.c 2007-10-29 14:37:49.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 "xdg-open %s"
#endif

View File

@ -121,7 +121,7 @@ Requires: htmlview
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 @@ extensions.
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 @@ fi
%{_libdir}/pkgconfig/*
%changelog
* Mon Oct 29 2007 Nils Philippsen <nphilipp@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@redhat.com> - 2:2.4.0-3
- add epoch to obsoletes