From 1d995dfe2303fa489ac5ebe450dc606f83c0e526 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Tue, 24 Mar 2009 13:02:39 +0000
Subject: [PATCH] lrelease only shows warning when duplicate messages found in
 *.ts( #491514)

---
 qt-x11-opensource-src-4.5.0-lrelease.patch | 11 +++++++++++
 qt.spec                                    |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 qt-x11-opensource-src-4.5.0-lrelease.patch

diff --git a/qt-x11-opensource-src-4.5.0-lrelease.patch b/qt-x11-opensource-src-4.5.0-lrelease.patch
new file mode 100644
index 0000000..544122d
--- /dev/null
+++ b/qt-x11-opensource-src-4.5.0-lrelease.patch
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/qt.spec b/qt.spec
index 4df8ff7..7a56dbf 100644
--- a/qt.spec
+++ b/qt.spec
@@ -12,7 +12,7 @@ Epoch:   1
 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 @@ Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 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 @@ test -x apply_patches && ./apply_patches
 %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 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Tue Mar 24 2009 Than Ngo <than@redhat.com> - 4.5.0-9
+- lrelease only shows warning when duplicate messages found in *.ts( #491514)
+
 * Fri Mar 20 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.5.0-8
 - qt-copy-patches-20090319