rpms/gtk-qt-engine/EL-5 gtk-qt-engine-0.8-ooo.patch, NONE, 1.1 gtk-qt-engine.spec, 1.29, 1.30 gtk-qt-engine-dt.patch, 1.2, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Feb 29 11:42:39 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/gtk-qt-engine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16591
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 (#232159,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/EL-5/gtk-qt-engine.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gtk-qt-engine.spec 14 Jan 2008 12:58:29 -0000 1.29
+++ gtk-qt-engine.spec 29 Feb 2008 11:42:05 -0000 1.30
@@ -6,7 +6,7 @@
Group: User Interface/Desktops
Epoch: 1
Version: 0.8
-Release: 2%{?dist}
+Release: 4%{?dist}
License: GPLv2+
URL: http://gtk-qt.ecs.soton.ac.uk/
@@ -21,6 +21,8 @@
# 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
@@ -45,6 +47,7 @@
%setup -q -n %{name}
%patch1 -p1 -b .nspluginviewer
+%patch2 -p1 -b .ooo
%build
@@ -81,7 +84,13 @@
%{_libdir}/kde3/kcm_*.*
-%changelog
+%changelog
+* Fri Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-4
+- fix ooffice detection (#232159,gtk-qt#24)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:0.8-3
+- Autorebuild for GCC 4.3
+
* Mon Jan 14 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1:0.8-2
- nslpluginviewer patch (kde#132138c#48)
--- gtk-qt-engine-dt.patch DELETED ---
More information about the fedora-extras-commits
mailing list