[wget/f16] Backported translation of "eta" for zh_CN from wget-1.13.4 (#799344)

[Tomas Hozza]

commit db3f71736fe87634b43bbbfc8ed6b8fafb88267a
Author: Tomas Hozza <thozza at redhat.com>
Date:   Wed Oct 10 15:56:18 2012 +0200

    Backported translation of "eta" for zh_CN from wget-1.13.4 (#799344)

 wget-1.12-zh_CN-eta_translation.patch |   12 ++++++++++++
 wget.spec                             |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/wget-1.12-zh_CN-eta_translation.patch b/wget-1.12-zh_CN-eta_translation.patch
new file mode 100644
index 0000000..e5827bb
--- /dev/null
+++ b/wget-1.12-zh_CN-eta_translation.patch
@@ -0,0 +1,12 @@
+diff -up wget-1.12/po/zh_CN.po.eta_translation wget-1.12/po/zh_CN.po
+--- wget-1.12/po/zh_CN.po.eta_translation	2012-10-10 13:22:00.516813241 +0200
++++ wget-1.12/po/zh_CN.po	2012-10-10 13:23:13.178674169 +0200
+@@ -1943,7 +1943,7 @@ msgstr "æ— æ•ˆçš„è¿›åº¦æŒ‡ç¤ºæ–¹å¼ %sï¼
+ #: src/progress.c:805
+ #, c-format
+ msgid "  eta %s"
+-msgstr " eta(英国中部时间) %s"
++msgstr " 估时 %s"
+ 
+ #: src/progress.c:1050
+ msgid "   in "
diff --git a/wget.spec b/wget.spec
index fd0600a..ed0c3cf 100644
--- a/wget.spec
+++ b/wget.spec
@@ -1,7 +1,7 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols
 Name: wget
 Version: 1.12
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 Group: Applications/Internet
 Url: http://www.gnu.org/software/wget/
@@ -13,6 +13,8 @@ Patch2: wget-1.12-path.patch
 Patch3: wget-1.12-certificate-subjectAltName.patch
 # Upstream Bug: http://savannah.gnu.org/bugs/?26786
 Patch4: wget-1.12-tls_sni_support.patch
+# Patch for "po/zh_CN.po" backported from wget-1.13.4
+Patch5: wget-1.12-zh_CN-eta_translation.patch
 
 Provides: webclient
 Requires(post): /sbin/install-info
@@ -35,6 +37,7 @@ support for Proxy servers, and configurability.
 %patch2 -p1
 %patch3 -p0 -b .cert_altNames
 %patch4 -p1 -b .tls_sni_support
+%patch5 -p1 -b .eta_translation
 
 %build
 if pkg-config openssl ; then
@@ -43,6 +46,8 @@ if pkg-config openssl ; then
 fi
 %configure --with-ssl --enable-largefile --enable-opie --enable-digest --enable-ntlm --enable-nls --enable-ipv6 --disable-rpath
 make %{?_smp_mflags}
+# Need to recompile "po/zh_CN.gmo" because of Patch5
+make --directory="po" zh_CN.gmo
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -71,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*
 
 %changelog
+* Wed Oct 10 2012 Tomas Hozza <thozza at redhat.com> - 1.12-6
+- Backported translation of "eta" for zh_CN from wget-1.13.4 (#799344)
+
 * Tue Oct 09 2012 Tomas Hozza <thozza at redhat.com> - 1.12-5
 - Fixed TLS SNI Support in wget (#836822)