[mysql-workbench] improve launcher (don't rely on program path, #915040)

[Remi Collet]

commit cf01372ab0bd82da079aa4210ffc9639a47f49e1
Author: Remi Collet <rcollet at redhat.com>
Date:   Sun Feb 24 15:26:19 2013 +0100

    improve launcher (don't rely on program path, #915040)

 mysql-workbench-5.2.47-launcher.patch |   14 ++++++++++++++
 mysql-workbench.spec                  |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/mysql-workbench-5.2.47-launcher.patch b/mysql-workbench-5.2.47-launcher.patch
new file mode 100644
index 0000000..9fb2a4d
--- /dev/null
+++ b/mysql-workbench-5.2.47-launcher.patch
@@ -0,0 +1,14 @@
+--- mysql-workbench-gpl-5.2.47-src/frontend/linux/workbench/mysql-workbench.in.orig	2013-02-24 14:44:33.607477315 +0100
++++ mysql-workbench-gpl-5.2.47-src/frontend/linux/workbench/mysql-workbench.in	2013-02-24 14:47:29.038788041 +0100
+@@ -7,10 +7,7 @@
+ # force disable the Mac style single menu hack in Ubuntu Unity
+ UBUNTU_MENUPROXY=0
+ 
+-program_path="$0"
+-
+-bindirname=`dirname $program_path`
+-basedirname=$(cd "$bindirname/..";pwd)
++basedirname=$(dirname @libdir@)
+ 
+ libdir=$(basename @libdir@)
+ libexecdir=$(basename @libexecdir@)
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index b2b81e4..e14e4b8 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -12,7 +12,7 @@
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
 Version:   5.2.47
-Release:   1%{?dist}
+Release:   2%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -42,6 +42,9 @@ Patch5:    %{name}-5.2.44-antlr.patch
 Patch6:    %{name}-5.2.46-noautocc.patch
 # Use system vsqlite++ (not ready) - NOT applied
 Patch7:    %{name}-5.2.44-vsqlite.patch
+# Improve launcher (don't rely on program path)
+# http://bugs.mysql.com/68479
+Patch8:    %{name}-5.2.47-launcher.patch
 
 # don't use bundled documentation, redirect to online doc
 # http://bugs.mysql.com/68325
@@ -157,6 +160,7 @@ rm -rf ext/antlr-runtime
 %endif
 
 %patch6 -p1 -b .noautocc
+%patch8 -p1 -b .launcher
 %patch9 -p1 -b .nodocs
 
 touch -r COPYING .timestamp4rpm
@@ -243,6 +247,9 @@ fi
 
 
 %changelog
+* Sun Feb 24 2013 Remi Collet <remi at fedoraproject.org> 5.2.47-2
+- improve launcher (don't rely on program path, #915040)
+
 * Fri Feb 22 2013 Remi Collet <remi at fedoraproject.org> 5.2.47-1
 - update to 5.2.47 Community (OSS) Edition (GPL)
   http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-5-2-47.html