- up to 1.19.4

diff --git a/wget-tests.patch b/wget-tests.patch
deleted file mode 100644 (file)
index c81622b..0000000
--- a/wget-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- wget-1.19.2/testenv/conf/expected_files.py.org     2017-10-30 12:36:46.911716601 +0100
-+++ wget-1.19.2/testenv/conf/expected_files.py 2017-10-30 12:41:03.358656484 +0100
-@@ -24,9 +24,9 @@ class ExpectedFiles:
-         snapshot = {}
-         for parent, dirs, files in os.walk('.'):
-             for name in files:
--                # pubring.kbx will be created by libgpgme if $HOME doesn't contain the .gnupg directory.
-+                # pubring.kbx, dirmngr.conf, gpg.conf can be created by libgpgme if $HOME doesn't contain the .gnupg directory.
-                                        # setting $HOME to CWD (in base_test.py) breaks two Metalink tests, so we skip this file here.
--                if name == 'pubring.kbx':
-+                if name in [ 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]:
-                     continue
- 
-                 f = {'content': ''}

diff --git a/wget.spec b/wget.spec
index 95a73cabbe96ace4d77ff1520132ace3d5c84326..a96b024e14c02aea89dfe86bbf3942db72920357 100644 (file)
--- a/wget.spec
+++ b/wget.spec
@@ -17,12 +17,12 @@ Summary(ru.UTF-8):  Утилита для получения файлов по п
 Summary(uk.UTF-8):     Утиліта для отримання файлів по протоколам HTTP та FTP
 Summary(zh_CN.UTF-8):  [通讯]功能强大的下载程序,支持断点续传
 Name:          wget
-Version:       1.19.2
+Version:       1.19.4
 Release:       1
 License:       GPL v3+ with OpenSSL exception
 Group:         Networking/Utilities
 Source0:       http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.lz
-# Source0-md5: 11663ce60f71c72773c30ae08a279011
+# Source0-md5: 50d3c7b607ef4addccc21eae7ba35430
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: d8b2b56ec7461606c22edbafaf8a418f
 Patch0:                %{name}-info.patch
@@ -30,7 +30,6 @@ Patch1:               %{name}-wgetrc_path.patch
 Patch2:                %{name}-home_etc.patch
 Patch3:                %{name}-ssl-certs.patch
 Patch4:                user.xdg.origin.url.patch
-Patch5:                %{name}-tests.patch
 URL:           http://www.gnu.org/software/wget/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.9
@@ -138,7 +137,6 @@ Proxy серверів, настроюваність.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion po/stamp-po