- new/updated

Changed files:
    openoffice-ooo-wrapper.patch -> 1.1
    openoffice-rh-disable-spellcheck-all-langs.patch -> 1.4

diff --git a/openoffice-ooo-wrapper.patch b/openoffice-ooo-wrapper.patch
new file mode 100644 (file)
index 0000000..9a1811b
--- /dev/null
+++ b/openoffice-ooo-wrapper.patch
@@ -0,0 +1,35 @@
+diff -urN ooo-build-1.3.2.org/bin/ooo-wrapper.in ooo-build-1.3.2/bin/ooo-wrapper.in
+--- ooo-build-1.3.2.org/bin/ooo-wrapper.in     2004-08-29 22:33:54.333582984 +0200
++++ ooo-build-1.3.2/bin/ooo-wrapper.in 2004-08-29 22:35:19.000000000 +0200
+@@ -422,10 +422,27 @@
+ 
+ # select the preferred icons set by the running windowmanager
+ unless (defined $icons_set) {
+-    $icons_set="kde" if (-d "$SystemInstallDir/program/resource.kde" &&
+-                         "$ENV{WINDOWMANAGER}" =~ ".*kde\$");
+-    $icons_set="gnome" if (-d "$SystemInstallDir/program/resource.gnome" &&
+-                         "$ENV{WINDOWMANAGER}" =~ ".*gnome\$");
++    if (exists $ENV{WINDOWMANAGER}) {
++        if (-d "$SystemInstallDir/program/resource.kde" &&
++            "$ENV{WINDOWMANAGER}" =~ ".*kde\$") {
++                $icons_set="kde";
++        } elsif (-d "$SystemInstallDir/program/resource.gnome" &&
++            "$ENV{WINDOWMANAGER}" =~ ".*gnome\$") {
++                $icons_set="gnome";
++        }
++    }
++
++    if (not defined $icons_set) {
++        if (-d "$SystemInstallDir/program/resource.default") {
++            $icons_set="default";
++        } elsif (-d "$SystemInstallDir/program/resource.kde") {
++            $icons_set="kde";
++        } elsif (-d "$SystemInstallDir/program/resource.gnome") {
++            $icons_set="gnome";
++        } else {
++            $icons_set="default";
++        }
++    }
+ }
+ 
+ if (defined $icons_set) {

diff --git a/openoffice-rh-disable-spellcheck-all-langs.patch b/openoffice-rh-disable-spellcheck-all-langs.patch
index 049697e0f65362810fa08cd35a72cfc068fe72d4..250c1c31255f03882fa184e7cf6654fed1f26917 100644 (file)
--- a/openoffice-rh-disable-spellcheck-all-langs.patch
+++ b/openoffice-rh-disable-spellcheck-all-langs.patch
@@ -1,14 +1,13 @@
-diff -urN ooo-build-1.3.0.org/patches/OOO_1_1_2/apply ooo-build-1.3.0/patches/OOO_1_1_2/apply
---- ooo-build-1.3.0.org/patches/OOO_1_1_2/apply        2004-07-17 01:55:51.574333152 +0200
-+++ ooo-build-1.3.0/patches/OOO_1_1_2/apply    2004-07-17 01:57:09.977414072 +0200
-@@ -107,6 +107,10 @@
- build-pl-conditionals.diff
+diff -urN ooo-build-1.3.2.org/patches/OOO_1_1_2/apply ooo-build-1.3.2/patches/OOO_1_1_2/apply
+--- ooo-build-1.3.2.org/patches/OOO_1_1_2/apply        2004-08-29 22:33:55.506404688 +0200
++++ ooo-build-1.3.2/patches/OOO_1_1_2/apply    2004-08-29 22:41:39.287899184 +0200
+@@ -864,6 +864,9 @@
+ # splash
+ pld-splash.diff
  
- [ Misc ]
-+# disable "Check in all languages" in the UI and set the
-+# value to false in preferences
++#
 +gui-disable-spellcheck-all-langs.diff
 +
- # Allow building with new (4.6.x) STLport - #28564
- stlport-compile-fix.diff
+ #######################################################
+ [ ArkOnly ]