[packages/wget] Up to 1.25.0

arekm arekm at pld-linux.org
Tue Nov 12 01:54:21 CET 2024


commit 31588ff3531f571c998651ed127f23932313c0ee
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Nov 11 23:57:21 2024 +0100

    Up to 1.25.0

 gnupg-2.4.1-tests.patch | 30 ------------------------------
 wget.spec               |  8 +++-----
 2 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/wget.spec b/wget.spec
index 92dfa38..be4b81a 100644
--- a/wget.spec
+++ b/wget.spec
@@ -18,12 +18,12 @@ Summary(ru.UTF-8):	Утилита для получения файлов по п
 Summary(uk.UTF-8):	Утиліта для отримання файлів по протоколам HTTP та FTP
 Summary(zh_CN.UTF-8):	[通讯]功能强大的下载程序,支持断点续传
 Name:		wget
-Version:	1.21.4
-Release:	2
+Version:	1.25.0
+Release:	1
 License:	GPL v3+ with OpenSSL exception
 Group:		Networking/Utilities
 Source0:	http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.lz
-# Source0-md5:	6d4ab603f1b905b6856a111c61078740
+# Source0-md5:	a6db8e9deb84fab9d69e935958751f1b
 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
@@ -31,7 +31,6 @@ Patch1:		%{name}-wgetrc_path.patch
 Patch2:		%{name}-home_etc.patch
 Patch3:		%{name}-ssl-certs.patch
 Patch4:		user.xdg.origin.url.patch
-Patch5:		gnupg-2.4.1-tests.patch
 URL:		http://www.gnu.org/software/wget/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	autoconf-archive
@@ -145,7 +144,6 @@ Proxy серверів, настроюваність.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion po/stamp-po
 
diff --git a/gnupg-2.4.1-tests.patch b/gnupg-2.4.1-tests.patch
deleted file mode 100644
index afbc9e2..0000000
--- a/gnupg-2.4.1-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 478b2e93a2b4102d5c76332ea5ff6a1a920ae0db Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Fri, 12 May 2023 01:44:13 +0200
-Subject: [PATCH] * testenv/conf/expected_files.py: Ignore common.conf
-
-Signed-off-by: Jan Palus <jpalus at fastmail.com>
----
- testenv/conf/expected_files.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testenv/conf/expected_files.py b/testenv/conf/expected_files.py
-index 65adb707..72146726 100644
---- a/testenv/conf/expected_files.py
-+++ b/testenv/conf/expected_files.py
-@@ -24,10 +24,10 @@ class ExpectedFiles:
-         snapshot = {}
-         for parent, dirs, files in os.walk('.'):
-             for name in files:
--                # pubring.gpg, pubring.kbx, dirmngr.conf, gpg.conf will be created by libgpgme
-+                # pubring.gpg, pubring.kbx, common.conf, dirmngr.conf, gpg.conf will 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 in [ 'pubring.gpg', 'pubring.kbx', 'dirmngr.conf', 'gpg.conf' ]:
-+                if name in [ 'pubring.gpg', 'pubring.kbx', 'common.conf', 'dirmngr.conf', 'gpg.conf' ]:
-                     continue
- 
-                 f = {'content': ''}
--- 
-2.40.1
-
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list