diff options
| author | Jan Palus | 2023-05-11 23:48:08 (GMT) |
|---|---|---|
| committer | Jan Palus | 2023-05-11 23:48:08 (GMT) |
| commit | b4d14d56e770009f67fd6bf6bc603c2cec492fd4 (patch) | |
| tree | d956f850338c2ccbe4458acf9690a557337cd23d | |
| parent | dadc3be2100052181506c1a02745376d43ec9cd2 (diff) | |
| download | wget-master.zip wget-master.tar.gz | |
fix build with gnupg >= 2.4.1; rel 2HEADauto/th/wget-1.21.4-2master
see https://savannah.gnu.org/bugs/index.php?64184
| -rw-r--r-- | gnupg-2.4.1-tests.patch | 30 | ||||
| -rw-r--r-- | wget.spec | 4 |
2 files changed, 33 insertions, 1 deletions
diff --git a/gnupg-2.4.1-tests.patch b/gnupg-2.4.1-tests.patch new file mode 100644 index 0000000..afbc9e2 --- /dev/null +++ b/gnupg-2.4.1-tests.patch @@ -0,0 +1,30 @@ +From 478b2e93a2b4102d5c76332ea5ff6a1a920ae0db Mon Sep 17 00:00:00 2001 +From: Jan Palus <jpalus@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@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 + @@ -19,7 +19,7 @@ Summary(uk.UTF-8): Утиліта для отримання файлів по п Summary(zh_CN.UTF-8): [通讯]功能强大的下载程序,支持断点续传 Name: wget Version: 1.21.4 -Release: 1 +Release: 2 License: GPL v3+ with OpenSSL exception Group: Networking/Utilities Source0: http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.lz @@ -31,6 +31,7 @@ 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 @@ -144,6 +145,7 @@ Proxy серверів, настроюваність. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %{__rm} doc/wget.info doc/sample.wgetrc.munged_for_texi_inclusion po/stamp-po |