rpms/gtk-qt-engine/devel gtk-qt-engine-0.8-ooo.patch, NONE, 1.1 gtk-qt-engine.spec, 1.33, 1.34 gtk-qt-engine-dt.patch, 1.2, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16146

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-0.8-ooo.patch 
Removed Files:
	gtk-qt-engine-dt.patch 
Log Message:
* Fri Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-4
- fix ooffice detection (gtk-qt#24)


gtk-qt-engine-0.8-ooo.patch:

--- NEW FILE gtk-qt-engine-0.8-ooo.patch ---
diff -up gtk-qt-engine/src/qt_qt_wrapper.cpp.ooo gtk-qt-engine/src/qt_qt_wrapper.cpp
--- gtk-qt-engine/src/qt_qt_wrapper.cpp.ooo	2008-02-29 05:21:00.000000000 -0600
+++ gtk-qt-engine/src/qt_qt_wrapper.cpp	2008-02-29 05:23:05.000000000 -0600
@@ -319,12 +319,12 @@ void createQApp()
 
 	mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox"));
 	
-	openOfficeFix = (cmdLine.endsWith("soffice.bin"))
-	              | (cmdLine.endsWith("swriter.bin"))
-	              | (cmdLine.endsWith("scalc.bin"))
-	              | (cmdLine.endsWith("sdraw.bin"))
-	              | (cmdLine.endsWith("spadmin.bin"))
-	              | (cmdLine.endsWith("simpress.bin"));
+	openOfficeFix = (cmdLine.contains("soffice.bin"))
+	              | (cmdLine.contains("swriter.bin"))
+	              | (cmdLine.contains("scalc.bin"))
+	              | (cmdLine.contains("sdraw.bin"))
+	              | (cmdLine.contains("spadmin.bin"))
+	              | (cmdLine.contains("simpress.bin"));
 
 	eclipseFix = cmdLine.contains("eclipse");
 	


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gtk-qt-engine.spec	19 Feb 2008 21:13:33 -0000	1.33
+++ gtk-qt-engine.spec	29 Feb 2008 11:27:02 -0000	1.34
@@ -6,7 +6,7 @@
 Group:	 User Interface/Desktops
 Epoch:   1
 Version: 0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+
 URL: 	 http://gtk-qt.ecs.soton.ac.uk/
@@ -21,11 +21,17 @@
 
 # see http://bugs.kde.org/132138c#48
 Patch1: gtk-qt-engine-0.8-nspluginviewer.patch 
+# http://gtk-qt.ecs.soton.ac.uk/trac/ticket/24
+Patch2: gtk-qt-engine-0.8-ooo.patch
 
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: gtk2-devel
+%if 0%{?fedora} > 6
 BuildRequires: kdelibs3-devel
+%else
+BuildRequires: kdelibs-devel
+%endif
 BuildRequires: libbonoboui-devel
 BuildRequires: libpng-devel
 
@@ -41,6 +47,7 @@
 %setup -q  -n %{name}
 
 %patch1 -p1 -b .nspluginviewer
+%patch2 -p1 -b .ooo
 
 
 %build
@@ -78,6 +85,9 @@
 
 
 %changelog
+* Fri Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-4
+- fix ooffice detection (gtk-qt#24)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:0.8-3
 - Autorebuild for GCC 4.3
 


--- gtk-qt-engine-dt.patch DELETED ---