diff --git a/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch b/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch new file mode 100644 index 0000000..7762ac0 --- /dev/null +++ b/qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch @@ -0,0 +1,12 @@ +diff -up qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp +--- qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp.uic_multilib 2010-05-03 19:43:25.000000000 -0500 ++++ qt-everywhere-opensource-src-4.7.0-beta1/src/tools/uic/uic.cpp 2010-06-25 14:05:31.309711152 -0500 +@@ -139,7 +139,7 @@ void Uic::writeCopyrightHeader(DomUI *ui + out << "/********************************************************************************\n"; + out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; + out << "**\n"; +- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; ++ out << "** Created: " << "\n"; + out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); + out << "**\n"; + out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; diff --git a/qt.spec b/qt.spec index d681a9c..9b147a7 100644 --- a/qt.spec +++ b/qt.spec @@ -19,7 +19,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.7.0 -Release: 0.19.%{pre}%{?dist} +Release: 0.20.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -40,6 +40,7 @@ Source5: qconfig-multilib.h # multilib hacks Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch +Patch4: qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch # include kde4 plugin path, http://bugzilla.redhat.com/498809 @@ -467,6 +468,7 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` %if "%{_qt4_datadir}" != "%{_qt4_prefix}" %patch3 -p1 -b .multilib-QMAKEPATH %endif +%patch4 -p1 -b .uic_multilib sed -i \ -e "s|-O2|$RPM_OPT_FLAGS|g" \ @@ -1082,6 +1084,9 @@ fi %changelog +* Fri Jun 20 2010 Rex Dieter 4.7.0-0.20.beta1 +- avoid timestamps in uic-generated files to be multilib-friendly + * Fri Jun 18 2010 Rex Dieter 4.7.0-0.19.beta1 - revert -no-javascript-jit change, false-alarm (#604003) - QtWebKit does not search correct plugin path(s) (#568860)