[Libreoffice] [REVIEW for 3-4-2] more distro-pack-install fixes

Hi guys,

On Mon, 2011-07-18 at 16:58 +0200, Petr Mladek wrote:
> the below patches should fix two more problems reported by Andy. I would
> like to get them into libreoffice-3-4-2 branch.

        I've pushed them to libreoffice-3-4; and I attach them here, two more
ack's needed, I understand Andreas' problem was solved too.

        Thanks,

                Michael.

-- 
 michael.meeks@novell.com  <><, Pseudo Engineer, itinerant idiot

From 2046eaeaaabbc58326066ee37f53cc97ebf679bb Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Mon, 18 Jul 2011 19:47:39 +0200
Subject: [PATCH 4/4] distro-install-desktop-integration: put $PREFIXDIR/bin/soffice into file list

---
 bin/distro-install-desktop-integration |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 9e3b499..77ccf3a 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -161,6 +161,7 @@ add_wrapper unopkg         unopkg  ""            "unopkg"      ""
 #       For example, the Novell package mark this symlink as %ghost
 #      and update it in %post and %postun
 ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
+test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" 
> > $DESTDIR/gid_Module_Root_Brand
 
 # create bash completion
 mkdir -p $DESTDIR/etc/bash_completion.d
-- 
1.7.3.4

From 72d5c4c3f7d2a5d329eb74fa1d1f69c1fb8c15b9 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Mon, 18 Jul 2011 16:50:18 +0200
Subject: [PATCH 3/3] distro-install: fix en-US-only installation

generate en-US file list when --with-distro=""

sigh, we should set WITH_LANG=en-US when no language is selected; the empty
string is pretty ugly; unforrunately, many makefile tests check for
this empty variable
---
 configure.in |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/configure.in b/configure.in
index 18f93d2..65813cb 100755
--- a/configure.in
+++ b/configure.in
@@ -7906,6 +7906,9 @@ for lang in $WITH_LANG ; do
 done
 # list with substituted ALL
 WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
+# this variable is used only by bin/distro-install-* helper scripts
+# they need a real list of languages
+test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
 AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)
 AC_SUBST(WITH_LANG_LIST)
-- 
1.7.3.4

From 7b202653f352a6c1bd18066bc71c93b1a5b33c13 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Mon, 18 Jul 2011 16:48:49 +0200
Subject: [PATCH 2/3] distro-install-desktop-integration: do not pack libreoffice-base.desktop twice

---
 bin/distro-install-desktop-integration |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 600c54e..9e3b499 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -148,7 +148,7 @@ add_wrapper lomath         soffice "--math"       "libreoffice" "libreoffice-mat
 add_wrapper loimpress      soffice "--impress"    "libreoffice" "libreoffice-impress.desktop"     
"gid_Module_Brand_Prg_Impress"
 add_wrapper loweb          soffice "--web"        "libreoffice" ""                                
"gid_Module_Brand_Prg_Wrt"
 add_wrapper lowriter       soffice "--writer"     "libreoffice" "libreoffice-writer.desktop"      
"gid_Module_Brand_Prg_Wrt"
-add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" "libreoffice-base.desktop"        
"gid_Module_Root_Brand"
+add_wrapper lofromtemplate soffice ".uno:NewDoc"  "libreoffice" ""                                
"gid_Module_Root_Brand"
 add_wrapper libreoffice    soffice ""            "libreoffice" "libreoffice-startcenter.desktop" 
"gid_Module_Root_Brand"
 add_wrapper loffice        soffice ""            "libreoffice" ""                                
"gid_Module_Root_Brand"
 add_wrapper unopkg         unopkg  ""            "unopkg"      ""                                
"gid_Module_Root_Brand"
-- 
1.7.3.4