sync from F-12/ branch

xdg-utils-1.0.2-htmlview.patch

@@ -1,12 +0,0 @@
-diff -up xdg-utils/scripts/xdg-open.in.htmlview xdg-utils/scripts/xdg-open.in
---- xdg-utils/scripts/xdg-open.in.htmlview	2008-01-24 14:24:51.000000000 -0600
-+++ xdg-utils/scripts/xdg-open.in	2008-11-21 14:00:34.000000000 -0600
-@@ -130,7 +130,7 @@ detectDE
- if [ x"$DE" = x"" ]; then
-     # if BROWSER variable is not set, check some well known browsers instead
-     if [ x"$BROWSER" = x"" ]; then
--        BROWSER=firefox:mozilla:netscape
-+        BROWSER=htmlview:firefox:mozilla:netscape:links:lynx
-     fi
-     DE=generic
- fi

xdg-utils-htmlview.patch

@@ -0,0 +1,12 @@
+diff -up xdg-utils/scripts/xdg-open.in.htmlview xdg-utils/scripts/xdg-open.in
+--- xdg-utils/scripts/xdg-open.in.htmlview	2010-03-07 04:45:48.000000000 -0600
++++ xdg-utils/scripts/xdg-open.in	2010-04-11 19:55:43.740818192 -0500
+@@ -193,7 +193,7 @@ if [ x"$DE" = x"" ]; then
+     if [ x"$BROWSER" = x"" ]; then
+         BROWSER=links2:links:lynx:w3m
+         if [ -n "$DISPLAY" ]; then
+-            BROWSER=firefox:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
++            BROWSER=htmlview:mozilla:epiphany:konqueror:chromium-browser:google-chrome:$BROWSER
+         fi
+     fi
+     DE=generic

xdg-utils.spec

@@ -24,7 +24,7 @@ BuildArch: noarch
 
 Source10: htmlview.sh
 
-Patch1: xdg-utils-1.0.2-htmlview.patch
+Patch1: xdg-utils-htmlview.patch
 
 BuildRequires: gawk
 BuildRequires: xmlto