From 2088d842abbdcf4f9889e472aa3250e64ac49bc789223b9d3a2cfc26cd65a39c Mon Sep 17 00:00:00 2001 From: Lubos Lunak Date: Fri, 9 Apr 2010 13:10:44 +0000 Subject: [PATCH] Accepting request 37549 from X11:lxde Copy from X11:lxde/xdg-utils via accept of submit request 37549 revision 8. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/37549 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=8 --- xdg-utils-1.0.2-bnc591714.patch | 43 +++++++++++++++++++++++++++++++++ xdg-utils.changes | 5 ++++ xdg-utils.spec | 4 +++ 3 files changed, 52 insertions(+) create mode 100644 xdg-utils-1.0.2-bnc591714.patch diff --git a/xdg-utils-1.0.2-bnc591714.patch b/xdg-utils-1.0.2-bnc591714.patch new file mode 100644 index 0000000..4b04443 --- /dev/null +++ b/xdg-utils-1.0.2-bnc591714.patch @@ -0,0 +1,43 @@ +diff -uNr old-xdg-utils-1.0.2//scripts/xdg-email xdg-utils-1.0.2/scripts/xdg-email +--- old-xdg-utils-1.0.2//scripts/xdg-email 2010-04-02 16:58:27.281598288 +0200 ++++ xdg-utils-1.0.2/scripts/xdg-email 2010-04-02 17:00:27.931347778 +0200 +@@ -617,11 +617,12 @@ + 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 +- fi +- DE=generic ++ DE=generic ++fi ++ ++# if BROWSER variable is not set, check some well known browsers instead ++if [ x"$BROWSER" = x"" ]; then ++ BROWSER=firefox:mozilla:netscape + fi + + case "$DE" in +diff -uNr old-xdg-utils-1.0.2//scripts/xdg-open xdg-utils-1.0.2/scripts/xdg-open +--- old-xdg-utils-1.0.2//scripts/xdg-open 2010-04-02 16:58:27.290596083 +0200 ++++ xdg-utils-1.0.2/scripts/xdg-open 2010-04-02 16:59:40.015352868 +0200 +@@ -408,13 +408,14 @@ + 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 +- fi + DE=generic + fi + ++# if BROWSER variable is not set, check some well known browsers instead ++if [ x"$BROWSER" = x"" ]; then ++ BROWSER=firefox:mozilla:netscape ++fi ++ + case "$DE" in + kde) + open_kde "$url" diff --git a/xdg-utils.changes b/xdg-utils.changes index 6720ed1..431cf3f 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 28 17:43:15 UTC 2010 - andrea@opensuse.org + +- added xdg-utils-1.0.2-bnc591714.patch to fix bnc#591714 + ------------------------------------------------------------------- Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org diff --git a/xdg-utils.spec b/xdg-utils.spec index d632687..9970b8a 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -36,6 +36,9 @@ Patch3: xdg-kde4-upstream.patch # PATCH-FEATURE-UPSTREAM xdg-utils-1.0.2-lxde-support.patch fdo#26058 andrea@opensuse.org # this patch add lxde support to xdg-su and other scripts Patch4: %name-1.0.2-lxde-support.patch +# PATCH-FIX-UPSTREAM xdg-utils-1.0.2-bnc591714.patch fdo#27551 andrea@opensuse.org +# this patch fix bnc#591714 +Patch5: %name-1.0.2-bnc591714.patch %description The xdg-utils package is a set of simple scripts that provide basic @@ -61,6 +64,7 @@ these utilities work properly in their environment. %patch2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %configure