rpms/qt4/devel qt-x11-opensource-src-4.3.0-qassistant-qt4.patch, 1.2, 1.3 qt4.spec, 1.79, 1.80 qt-x11-opensource-src-4.4.0-qassistant-qt4.patch, 1.1, NONE

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18069

Modified Files:
	qt4.spec 
Added Files:
	qt-x11-opensource-src-4.3.0-qassistant-qt4.patch 
Removed Files:
	qt-x11-opensource-src-4.4.0-qassistant-qt4.patch 
Log Message:
revert qt-x11-opensource-src-4.3.0-qassistant-qt4.patch


qt-x11-opensource-src-4.3.0-qassistant-qt4.patch:

Index: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
===================================================================
RCS file: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
diff -N qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qt-x11-opensource-src-4.3.0-qassistant-qt4.patch	7 Jan 2008 18:50:30 -0000	1.3
@@ -0,0 +1,11 @@
+--- qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp.assistant4	2007-03-19 15:15:06.000000000 -0500
++++ qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp	2007-03-21 14:02:59.000000000 -0500
+@@ -172,7 +172,7 @@
+     : QObject( parent ), host ( QLatin1String("localhost") )
+ {
+     if ( path.isEmpty() )
+-        assistantCommand = QLatin1String("assistant");
++        assistantCommand = QLatin1String("assistant-qt4");
+     else {
+         QFileInfo fi( path );
+         if ( fi.isDir() )


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- qt4.spec	7 Jan 2008 17:37:48 -0000	1.79
+++ qt4.spec	7 Jan 2008 18:50:30 -0000	1.80
@@ -26,7 +26,7 @@
 Source5: qconfig-multilib.h
 
 # search for assistant-qt4 instead of (qt3's) assistant in $PATH 
-Patch1: qt-x11-opensource-src-4.4.0-qassistant-qt4.patch
+Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
 # multilib hacks 
 Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
 # strict aliasing violations in tool classes


--- qt-x11-opensource-src-4.4.0-qassistant-qt4.patch DELETED ---