rpms/qt/devel qt-x11-opensource-src-4.5.0-lrelease.patch, NONE, 1.1 qt.spec, 1.254, 1.255

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5978

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.0-lrelease.patch 
Log Message:
lrelease only shows warning when duplicate messages found in *.ts( #491514)


qt-x11-opensource-src-4.5.0-lrelease.patch:

--- NEW FILE qt-x11-opensource-src-4.5.0-lrelease.patch ---
--- qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp.orig	2009-03-24 13:42:02.000000000 +0100
+++ qt-x11-opensource-src-4.5.0/tools/linguist/lrelease/main.cpp	2009-03-24 13:47:21.000000000 +0100
@@ -102,7 +102,7 @@
                 if (!msg.comment().isEmpty())
                     qWarning("\n* Comment: %s", qPrintable(msg.comment()));
             }
-            ok = false;
+            //ok = false;
         }
     }
     return ok;


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- qt.spec	20 Mar 2009 14:00:57 -0000	1.254
+++ qt.spec	24 Mar 2009 13:02:39 -0000	1.255
@@ -12,7 +12,7 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -39,6 +39,7 @@
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
 Patch10: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 Patch11: qt-x11-opensource-src-4.5.0-linguist-crash.patch 
+Patch12: qt-x11-opensource-src-4.5.0-lrelease.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -317,6 +318,7 @@
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch10 -p1 -b .ppc64
 %patch11 -p1 -b .linguist-crash
+%patch12 -p1 -b .lrelease
 %patch50 -p1 -b .qhostaddress
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
@@ -800,6 +802,9 @@
 
 
 %changelog
+* Tue Mar 24 2009 Than Ngo <than at redhat.com> - 4.5.0-9
+- lrelease only shows warning when duplicate messages found in *.ts( #491514)
+
 * Fri Mar 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-8
 - qt-copy-patches-20090319