[packages/wget] - fixed problems with texinfo 5 and pod from perl 5.18 - rel 4

[baggins]

commit eb334c6640fbb10174c9ab65a18109b9a202d728
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 6 20:36:34 2013 +0100

    - fixed problems with texinfo 5 and pod from perl 5.18
    - rel 4

 wget-info.patch | 39 +++++++++++++++++++++++++++++++++++++++
 wget-pod.patch  | 15 +++++++++++++++
 wget.spec       |  4 +++-
 3 files changed, 57 insertions(+), 1 deletion(-)
---
diff --git a/wget.spec b/wget.spec
index 919701e..70cf5ff 100644
--- a/wget.spec
+++ b/wget.spec
@@ -17,7 +17,7 @@ Summary(uk.UTF-8):	Утиліта для отримання файлів по п
 Summary(zh_CN.UTF-8):	[通讯]功能强大的下载程序,支持断点续传
 Name:		wget
 Version:	1.14
-Release:	3
+Release:	4
 License:	GPL v3+ with OpenSSL exception
 Group:		Networking/Utilities
 Source0:	http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.xz
@@ -28,6 +28,7 @@ Patch0:		%{name}-info.patch
 Patch1:		%{name}-wgetrc_path.patch
 Patch2:		%{name}-home_etc.patch
 Patch3:		%{name}-ssl-certs.patch
+Patch4:		%{name}-pod.patch
 URL:		http://www.gnu.org/software/wget/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.9
@@ -120,6 +121,7 @@ Proxy серверів, настроюваність.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion po/stamp-po
 
 # temp hack for 1.13.4
diff --git a/wget-info.patch b/wget-info.patch
index cb49fc1..0a3f8cf 100644
--- a/wget-info.patch
+++ b/wget-info.patch
@@ -12,3 +12,42 @@
  @end direntry
  
  @ifnottex
+@@ -876,7 +876,7 @@
+ actions of one.
+ 
+ @cindex proxy
+- at itemx --no-proxy
++ at item --no-proxy
+ Don't use proxies, even if the appropriate @code{*_proxy} environment
+ variable is defined.
+ 
+@@ -977,9 +977,9 @@
+ whose encoding does not match the one used locally.
+ 
+ @cindex IPv6
+- at itemx -4
++ at item -4
+ @itemx --inet4-only
+- at itemx -6
++ at item -6
+ @itemx --inet6-only
+ Force connecting to IPv4 or IPv6 addresses.  With @samp{--inet4-only}
+ or @samp{-4}, Wget will only connect to IPv4 hosts, ignoring AAAA
+@@ -3092,7 +3092,7 @@
+ Change setting of passive @sc{ftp}, equivalent to the
+ @samp{--passive-ftp} option.
+ 
+- at itemx password = @var{string}
++ at item password = @var{string}
+ Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. 
+ This command can be overridden using the @samp{ftp_password} and 
+ @samp{http_password} command for @sc{ftp} and @sc{http} respectively.
+@@ -3603,7 +3603,7 @@
+ may be specified from within Wget itself.
+ 
+ @table @samp
+- at itemx --no-proxy
++ at item --no-proxy
+ @itemx proxy = on/off
+ This option and the corresponding command may be used to suppress the
+ use of proxy, even if the appropriate environment variables are set.
diff --git a/wget-pod.patch b/wget-pod.patch
new file mode 100644
index 0000000..61a478b
--- /dev/null
+++ b/wget-pod.patch
@@ -0,0 +1,15 @@
+--- wget-1.14/doc/texi2pod.pl.orig	2013-12-06 20:29:19.785649931 +0100
++++ wget-1.14/doc/texi2pod.pl	2013-12-06 20:32:09.288982037 +0100
+@@ -291,7 +291,11 @@
+ 	if (defined $1) {
+             my $thing = $1;
+             if ($ic =~ /\@asis/) {
+-                $_ = "\n=item $thing\n";
++		if ($thing =~ /^[0-9]+$/) {
++		    $_ = "\n=item C\<$thing\>\n";
++		} else {
++		    $_ = "\n=item $thing\n";
++		}
+             } else {
+                 # Entity escapes prevent munging by the <> processing below.
+                 $_ = "\n=item $ic\<$thing\>\n";
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wget.git/commitdiff/eb334c6640fbb10174c9ab65a18109b9a202d728