packages: wget/wget.spec, wget/wget-pl.po-update.patch (NEW) - added pl.po-...
qboosh
qboosh at pld-linux.org
Mon Aug 15 08:06:00 CEST 2011
Author: qboosh Date: Mon Aug 15 06:06:00 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added pl.po-update patch
- back to openssl by default, added gnutls bcond to use wget's default
---- Files affected:
packages/wget:
wget.spec (1.151 -> 1.152) , wget-pl.po-update.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/wget/wget.spec
diff -u packages/wget/wget.spec:1.151 packages/wget/wget.spec:1.152
--- packages/wget/wget.spec:1.151 Sun Aug 14 08:06:40 2011
+++ packages/wget/wget.spec Mon Aug 15 08:05:54 2011
@@ -4,6 +4,10 @@
# - http://wget-bugs.ferrara.linux.it/issue9
# - or http://osdir.com/ml/web.wget.patches/2005-09/msg00006.html
# - add http://article.gmane.org/gmane.comp.web.wget.patches/2333
+#
+# Conditional build:
+%bcond_with gnutls # use GnuTLS (wget default) instead of OpenSSL
+#
Summary: A utility for retrieving files using the HTTP or FTP protocols
Summary(es.UTF-8): Cliente en lÃnea de comando para bajar archivos WWW/FTP con recursión opcional
Summary(fr.UTF-8): Un utilitaire pour recuperer des fichiers en utilisant les protocoles HTTP ou FTP
@@ -25,12 +29,14 @@
Patch1: %{name}-wgetrc_path.patch
Patch2: %{name}-home_etc.patch
Patch3: %{name}-ssl-certs.patch
+Patch4: %{name}-pl.po-update.patch
URL: http://www.gnu.org/software/wget/
BuildRequires: autoconf >= 2.61
BuildRequires: automake >= 1:1.9
BuildRequires: gettext-devel >= 0.17
-BuildRequires: libtool
-BuildRequires: openssl-devel >= 0.9.7m
+%{?with_gnutls:BuildRequires: gnutls-devel}
+BuildRequires: libidn-devel
+%{!?with_gnutls:BuildRequires: openssl-devel >= 0.9.7m}
BuildRequires: perl-devel
BuildRequires: texinfo
Provides: webclient
@@ -114,16 +120,17 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion
+%patch4 -p1
+%{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion po/stamp-po
%build
-%{__libtoolize}
%{__gettextize}
%{__aclocal} -I m4
%{__autoheader}
%{__autoconf}
+%{__automake}
%configure \
- --with-ssl
+ --with-ssl%{!?with_gnutls:=openssl}
%{__make}
tail -n 6 util/README >rmold.README
@@ -139,7 +146,7 @@
cp -a doc/sample.wgetrc $RPM_BUILD_ROOT%{_sysconfdir}/wgetrc
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_mandir}/README*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README*
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
%find_lang %{name}
@@ -170,6 +177,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.152 2011/08/15 06:05:54 qboosh
+- added pl.po-update patch
+- back to openssl by default, added gnutls bcond to use wget's default
+
Revision 1.151 2011/08/14 06:06:40 arekm
- up to 1.13
================================================================
Index: packages/wget/wget-pl.po-update.patch
diff -u /dev/null packages/wget/wget-pl.po-update.patch:1.1
--- /dev/null Mon Aug 15 08:06:00 2011
+++ packages/wget/wget-pl.po-update.patch Mon Aug 15 08:05:54 2011
@@ -0,0 +1,148 @@
+--- wget-1.13/po/pl.po.orig 2011-08-09 15:52:19.000000000 +0200
++++ wget-1.13/po/pl.po 2011-08-14 21:51:54.253029029 +0200
+@@ -2,7 +2,7 @@
+ # Copyright (C) 2002, 2008, 2009 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the wget package.
+ # Wojciech Kotwica <wkotwica at post.pl>, 2002
+-# Jakub Bogusz <qboosh at pld-linux.org>, 2005-2010
++# Jakub Bogusz <qboosh at pld-linux.org>, 2005-2011
+ # based on unofficial translation of wget-1.6 by
+ # Arkadiusz Mi¶kiewicz <misiek at pld.ORG.PL>, 1998-2000.
+ # Wojciech Kotwica <wkotwica at post.pl> 2002-03-20 11:12+01:00
+@@ -11,10 +11,10 @@
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: wget 1.12-pre7\n"
++"Project-Id-Version: wget 1.13\n"
+ "Report-Msgid-Bugs-To: bug-wget at gnu.org\n"
+ "POT-Creation-Date: 2011-08-09 15:52+0200\n"
+-"PO-Revision-Date: 2010-08-09 19:32+0200\n"
++"PO-Revision-Date: 2011-08-14 21:45+0200\n"
+ "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
+ "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
+ "Language: pl\n"
+@@ -29,9 +29,9 @@
+ msgstr "Nieznany b³±d systemowy"
+
+ #: lib/getopt.c:547 lib/getopt.c:576
+-#, fuzzy, c-format
++#, c-format
+ msgid "%s: option '%s' is ambiguous; possibilities:"
+-msgstr "%s: opcja '%s' jest niejednoznaczna\n"
++msgstr "%s: opcja '%s' jest niejednoznaczna; mo¿liwo¶ci:"
+
+ #: lib/getopt.c:624 lib/getopt.c:628
+ #, c-format
+@@ -783,9 +783,9 @@
+ msgstr "Niemo¿liwe utworzenie po³±czenia SSL.\n"
+
+ #: src/http.c:2803
+-#, fuzzy, c-format
++#, c-format
+ msgid "Cannot unlink %s (%s).\n"
+-msgstr "Nie mo¿na zapisaæ do %s (%s).\n"
++msgstr "Nie mo¿na usun±æ %s (%s).\n"
+
+ #: src/http.c:2813
+ #, c-format
+@@ -927,6 +927,7 @@
+ "Parsing system wgetrc file failed, please check '%s'. Or specify a "
+ "different file using --config\n"
+ msgstr ""
++"Analiza systemowego pliku wgetrc nie powiod³a siê, proszê sprawdziæ '%s' lub okre¶liæ inny plik przy u¿yciu opcji --config\n"
+
+ #: src/init.c:623
+ #, c-format
+@@ -1134,9 +1135,8 @@
+ " (-i -F) wzglêdem URL-a.\n"
+
+ #: src/main.c:453
+-#, fuzzy
+ msgid " --config=FILE Specify config file to use.\n"
+-msgstr " --certificate=PLIK plik z certyfikatem klienta.\n"
++msgstr " --config=PLIK okre¶la plik konfiguracyjny do u¿ycia.\n"
+
+ #: src/main.c:457
+ msgid "Download:\n"
+@@ -1162,12 +1162,12 @@
+ msgstr " -O --output-document=PLIK zapisuje dokumenty do PLIKu.\n"
+
+ #: src/main.c:465
+-#, fuzzy
+ msgid ""
+ " -nc, --no-clobber skip downloads that would download to\n"
+ " existing files (overwriting them).\n"
+ msgstr ""
+-" -nc, --no-clobber zakazuje nadpisywania istniej±cych plików.\n"
++" -nc, --no-clobber pomija ¶ci±ganie, które zapisa³oby dane\n"
++" do istniej±cych plików (nadpisuj±c je).\n"
+
+ #: src/main.c:468
+ msgid ""
+@@ -1345,11 +1345,8 @@
+ "kodowania.\n"
+
+ #: src/main.c:531
+-#, fuzzy
+ msgid " --unlink remove file before clobber.\n"
+-msgstr ""
+-" --no-glob wy³±cza mo¿liwo¶æ u¿ywania znaków "
+-"globalnych.\n"
++msgstr " --unlink usuwa plik przed nadpisaniem.\n"
+
+ #: src/main.c:535
+ msgid "Directories:\n"
+@@ -1781,14 +1778,13 @@
+ msgstr " -I, --include-directories=LISTA lista akceptowanych katalogów.\n"
+
+ #: src/main.c:698
+-#, fuzzy
+ msgid ""
+ " --trust-server-names use the name specified by the "
+ "redirection\n"
+ " url last component.\n"
+ msgstr ""
+-" --trust-server-names u¿ycie nazw podanych jako ostatnich sk³adników URL-i "
+-"przekierowañ.\n"
++" --trust-server-names u¿ycie nazw podanych jako ostatnich\n"
++" sk³adników URL-i przekierowañ.\n"
+
+ #: src/main.c:701
+ msgid " -X, --exclude-directories=LIST list of excluded directories.\n"
+@@ -1911,6 +1907,7 @@
+ "Both --no-clobber and --convert-links were specified,only --convert-links "
+ "will be used.\n"
+ msgstr ""
++"Podano jednocze¶nie opcje --no-clobber i --convert-links; zostanie u¿yta tylko --convert-links.\n"
+
+ #: src/main.c:1105
+ #, c-format
+@@ -1992,13 +1989,14 @@
+ msgstr "Nie znaleziono URL-i w %s.\n"
+
+ #: src/main.c:1414
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "FINISHED --%s--\n"
+ "Total wall clock time: %s\n"
+ "Downloaded: %d files, %s in %s (%s)\n"
+ msgstr ""
+ "ZAKOÑCZONO --%s--\n"
++"Ca³kowity czas zegarowy: %s\n"
+ "Pobrano: %d plików, %s w %s (%s)\n"
+
+ #: src/main.c:1428
+@@ -2284,11 +2282,3 @@
+ #, c-format
+ msgid "Failed to unlink symlink %s: %s\n"
+ msgstr "Nie uda³o siê usun±æ dowi±zania symbolicznego %s: %s\n"
+-
+-#~ msgid ""
+-#~ "WARNING: Can't reopen standard output in binary mode;\n"
+-#~ " downloaded file may contain inappropriate line endings.\n"
+-#~ msgstr ""
+-#~ "UWAGA: Nie mo¿na ponownie otworzyæ standardowego wyj¶cia w trybie "
+-#~ "binarnym;\n"
+-#~ " ¶ci±gniête pliki mog± zawieraæ niew³a¶ciwe koñce linii.\n"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wget/wget.spec?r1=1.151&r2=1.152&f=u
More information about the pld-cvs-commit
mailing list