Mailinglist Archive: opensuse-commit (1500 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package OpenOffice_org-Quickstarter
checked in at Mon Nov 27 18:07:56 CET 2006.

--------
--- arch/i386/OpenOffice_org-Quickstarter/OpenOffice_org-Quickstarter.changes	2006-01-25 21:44:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/OpenOffice_org-Quickstarter/OpenOffice_org-Quickstarter.changes	2006-11-27 16:53:53.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Nov 27 16:13:34 CET 2006 - pmladek@xxxxxxx
+
+- fixed OOo wrapper detection [#223786]:
+    * did not work on openSUSE 10.2 by default; /usr/bin/ooo-wrapper does not
+      longer exist; /usr/bin/soffice is the right, version and architecture
+      independent, replacement
+    * user defined path was ignored when the Novell wrapper was available
+
+-------------------------------------------------------------------

New:
----
  oooqs-1.0_rc3-10.2_wrappers.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ OpenOffice_org-Quickstarter.spec ++++++
--- /var/tmp/diff_new_pack.mL48zc/_old	2006-11-27 18:07:03.000000000 +0100
+++ /var/tmp/diff_new_pack.mL48zc/_new	2006-11-27 18:07:03.000000000 +0100
@@ -1,11 +1,11 @@
 #
 # spec file for package OpenOffice_org-Quickstarter (Version 1.0)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -13,12 +13,12 @@
 Name:         OpenOffice_org-Quickstarter
 BuildRequires: kdelibs3-devel
 URL:          http://segfaultskde.berlios.de/index.php?content=oooqs
-License:      GPL
+License:        GNU General Public License (GPL)
 Group:        Productivity/Office/Suite
 Requires:     OpenOffice_org >= 1.9
 Autoreqprov:  on
 Version:      1.0
-Release:      472
+Release:        512
 Summary:      OpenOffice.org Quickstarter
 Source0:      oooqs-1.0_rc3.tar.bz2
 Source1:      ooqs-1.0-nld9-po.tar.bz2
@@ -38,10 +38,11 @@
 Patch13:      oooqs-1.0_rc3-invalid-popup-entries.patch
 Patch14:      oooqs-1.0_rc3-new-icons.patch
 Patch15:      oooqs-1.0_rc3-quickstart-options-2.0.patch
+Patch16:        oooqs-1.0_rc3-10.2_wrappers.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-This package allows you to work comfortably with OpenOffice.org in KDE,
+This package allows you to work comfortably with OpenOffice.org in KDE
 through the use of a small applet that runs in the Kicker.
 
 
@@ -69,6 +70,7 @@
 %patch13
 %patch14
 %patch15
+%patch16
 
 %build
 . /etc/opt/kde3/common_options
@@ -106,11 +108,17 @@
 /opt/kde3/share/icons/*
 
 %changelog -n OpenOffice_org-Quickstarter
+* Mon Nov 27 2006 - pmladek@xxxxxxx
+- fixed OOo wrapper detection [#223786]:
+  * did not work on openSUSE 10.2 by default; /usr/bin/ooo-wrapper does not
+  longer exist; /usr/bin/soffice is the right, version and architecture
+  independent, replacement
+  * user defined path was ignored when the Novell wrapper was available
 * Wed Jan 25 2006 - mls@xxxxxxx
 - converted neededforbuild to BuildRequires
 * Thu May 26 2005 - pmladek@xxxxxxx
 - fixed starting of the quickstart instance on backgroung; used -nologo
--nodefault instead of the no longer supported -quickstart option
+  -nodefault instead of the no longer supported -quickstart option
 - fixed requires as the package is usable only with OOo > 1.9 now
 * Mon Mar 14 2005 - pmladek@xxxxxxx
 - fixed the Open file dialog to filter also the new Oasis file-suffixes [#72283]

++++++ oooqs-1.0_rc3-10.2_wrappers.patch ++++++
--- oooqs/oooqs.cpp.old	2006-11-27 14:09:57.000000000 +0100
+++ oooqs/oooqs.cpp	2006-11-27 15:52:49.000000000 +0100
@@ -331,28 +331,49 @@
 	soffice = config->readEntry("exec", "/usr/lib/ooo-*");
 	sofficeFound=false;
 	
-	if (QFile::exists("/usr/bin/ooo-wrapper")) {
-		int i = soffice.findRev( "/usr/lib/ooo-",0);
-		if ((i == 0) ||
-	            (((soffice == QString("/opt/OpenOffice.org")) ||
-	              (soffice == QString("/opt/OpenOffice.org/"))) &&
-	             (!QFile::exists("/opt/OpenOffice.org/program/soffice")))) {
-			soffice="/usr/bin/ooo-wrapper";
+	if ((soffice == QString("/usr/lib/ooo-*")) ||
+	    (soffice == QString("/opt/OpenOffice.org")) ||
+	    (soffice == QString("/opt/OpenOffice.org/"))) {
+	        // default path setting is detected, so we will use the common version and
+		// architecture independent wrapper from the Novell package if available
+	     	if (QFile::exists("/usr/bin/soffice")) {
+			soffice="/usr/bin/soffice";
 			sofficeFound=true;
 		}
+		else if (QFile::exists("/usr/bin/ooo-wrapper")) {
+			soffice="/usr/bin/ooo-wrapper";
+			sofficeFound=true;
+	        }
+		// we cannot not use the wrapper "ooffice" because it finishes after
+		// the wizard disappears; so, we have to use another fallback for SL 10.1
+		// and SLED10 packages
+		else if (QFile::exists("/usr/lib/ooo-2.0/program/soffice")) {
+			soffice="/usr/lib/ooo-2.0/program/soffice";
+			sofficeFound=true;
+	        }
+		else if (QFile::exists("/usr/lib64/ooo-2.0/program/soffice")) {
+			soffice="/usr/lib64/ooo-2.0/program/soffice";
+			sofficeFound=true;
+	        }
 	}
-	else if (QFile::exists(soffice+"/soffice")){
-		soffice+="/soffice";
-		sofficeFound=true;
-	}
-	else if (QFile::exists(soffice+"/program/soffice")){
-		soffice+="/program/soffice";
-		sofficeFound=true;
-	}
-	else if (QFile::exists(soffice+"/program/soffice.bin")){
-		soffice+="/program/soffice.bin";
-		sofficeFound=true;
+
+	if (sofficeFound == false) {
+		// The user selected another path or the Novell wrappers were not found
+		// therefore we find the wrapper from the given path
+		if (QFile::exists(soffice+"/soffice")){
+			soffice+="/soffice";
+			sofficeFound=true;
+		}
+		else if (QFile::exists(soffice+"/program/soffice")){
+			soffice+="/program/soffice";
+			sofficeFound=true;
+		}
+		else if (QFile::exists(soffice+"/program/soffice.bin")){
+			soffice+="/program/soffice.bin";
+			sofficeFound=true;
+		}
 	}
+
 	if (quickstartEnabled != config->readBoolEntry("quickstart", false)){
 		if (quickstartEnabled){
 			quickstartEnabled=false;

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx