From c1d52b555eb9a51ca3ea7401e65ca5b28f228152 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Jan 24 2008 12:35:30 +0000
Subject: update qt-x11-free-3.3.8b-uic-multilib.patch


---

diff --git a/qt-x11-free-3.3.8b-uic-multilib.patch b/qt-x11-free-3.3.8b-uic-multilib.patch
new file mode 100644
index 0000000..341cab7
--- /dev/null
+++ b/qt-x11-free-3.3.8b-uic-multilib.patch
@@ -0,0 +1,24 @@
+diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp
+--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig	2008-01-24 13:25:29.000000000 +0100
++++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp	2008-01-24 13:28:17.000000000 +0100
+@@ -320,7 +320,7 @@ int main( int argc, char * argv[] )
+ 	out << "/****************************************************************************" << endl;
+ 	out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
+ 	out << "**" << endl;
+-	out << "** Created: " << QDateTime::currentDateTime().toString() << endl;
++	out << "** Created by User Interface Compiler" << endl;
+ 	out << "**" << endl;
+ 	out << "** WARNING! All changes made in this file will be lost!" << endl;
+ 	out << "****************************************************************************/" << endl << endl;
+diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp
+--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig	2008-01-24 13:28:30.000000000 +0100
++++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp	2008-01-24 13:29:10.000000000 +0100
+@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const
+     for ( it = images.begin(); it != images.end(); ++it )
+ 	out << "**      " << *it << "\n";
+     out << "**\n";
+-    out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
++    out << "** Created by The User Interface Compiler" << "\n";
+     out << "**\n";
+     out << "** WARNING! All changes made in this file will be lost!\n";
+     out << "****************************************************************************/\n";
diff --git a/qt-x11-free-3.3.8b-uic-multilib.patch.patch b/qt-x11-free-3.3.8b-uic-multilib.patch.patch
deleted file mode 100644
index 341cab7..0000000
--- a/qt-x11-free-3.3.8b-uic-multilib.patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp
---- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig	2008-01-24 13:25:29.000000000 +0100
-+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp	2008-01-24 13:28:17.000000000 +0100
-@@ -320,7 +320,7 @@ int main( int argc, char * argv[] )
- 	out << "/****************************************************************************" << endl;
- 	out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
- 	out << "**" << endl;
--	out << "** Created: " << QDateTime::currentDateTime().toString() << endl;
-+	out << "** Created by User Interface Compiler" << endl;
- 	out << "**" << endl;
- 	out << "** WARNING! All changes made in this file will be lost!" << endl;
- 	out << "****************************************************************************/" << endl << endl;
-diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp
---- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig	2008-01-24 13:28:30.000000000 +0100
-+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp	2008-01-24 13:29:10.000000000 +0100
-@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const
-     for ( it = images.begin(); it != images.end(); ++it )
- 	out << "**      " << *it << "\n";
-     out << "**\n";
--    out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
-+    out << "** Created by The User Interface Compiler" << "\n";
-     out << "**\n";
-     out << "** WARNING! All changes made in this file will be lost!\n";
-     out << "****************************************************************************/\n";
diff --git a/qt.spec b/qt.spec
index fcb048f..e45a690 100644
--- a/qt.spec
+++ b/qt.spec
@@ -28,7 +28,7 @@ Patch14: qt-x11-free-3.3.3-gl.patch
 Patch19: qt-3.3.3-gtkstyle.patch 
 Patch20: qt-x11-free-3.3.5-gcc4-buildkey.patch
 Patch24: qt-x11-free-3.3.5-uic.patch
-Patch25: qt-x11-free-3.3.8b-uic-multilib.patch.patch
+Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
 Patch26: qt-3.3.6-fontrendering-punjabi-209970.patch
 Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
 Patch28: qt-3.3.6-fontrendering-or_IN-209098.patch