Update to 9.4

This commit is contained in:
Neal Gompa 2021-07-17 07:38:38 -04:00
parent 5e5734dc7e
commit e77bf671a5
3 changed files with 8 additions and 40 deletions

View File

@ -1,33 +0,0 @@
From 6a582f49fa958e4ba3e374d0e77d814524111dfb Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Jan 23 2021 13:15:35 +0000
Subject: Use Accept-Encoding: identity together with decode_content=False
This should fix both the issues:
- gzips decompressed: https://pagure.io/rpmdevtools/issue/72
- texts compressed: https://pagure.io/rpmdevtools/issue/76
$ file tor-0.4.5.4-rc.tar.gz tor-0.4.5.4-rc.tar.gz.asc xrootd-5.0.3.tar.gz
tor-0.4.5.4-rc.tar.gz: gzip compressed data, max compression, from Unix, original size modulo 2^32 35962880
tor-0.4.5.4-rc.tar.gz.asc: PGP signature Signature (old)
xrootd-5.0.3.tar.gz: gzip compressed data, max compression, from Unix, original size modulo 2^32 981462405
---
diff --git a/rpmdev-spectool b/rpmdev-spectool
index 56a2d43..a324fab 100755
--- a/rpmdev-spectool
+++ b/rpmdev-spectool
@@ -239,6 +239,9 @@ def download(url, target, headers=None, tracker: Optional[ProgressTracker] = Non
headers = {}
headers.setdefault("User-Agent", "rpmdev-spectool")
+ # identity should prevent servers from sending gzip-compressed text
+ # which would later not be decompressed because we set decode_content=False
+ headers.setdefault("Accept-Encoding", "identity")
ret = requests.get(url, headers=headers, stream=True)
ret.raise_for_status()

View File

@ -1,6 +1,6 @@
Name: rpmdevtools Name: rpmdevtools
Version: 9.3 Version: 9.4
Release: 5%{?dist} Release: 1%{?dist}
Summary: RPM Development Tools Summary: RPM Development Tools
# rpmdev-setuptree is GPLv2, everything else GPLv2+ # rpmdev-setuptree is GPLv2, everything else GPLv2+
@ -8,10 +8,6 @@ License: GPLv2+ and GPLv2
URL: https://pagure.io/rpmdevtools URL: https://pagure.io/rpmdevtools
Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
# Use Accept-Encoding: identity together with decode_content=False
# This is to avoid text files downloaded gzipped
Patch1: https://pagure.io/rpmdevtools/pull-request/77.patch
# Fedora-specific downstream patches # Fedora-specific downstream patches
## Force legacy datestamp by default until rhbz#1715412 is resolved ## Force legacy datestamp by default until rhbz#1715412 is resolved
Patch1001: 0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch Patch1001: 0001-Force-legacy-datestamp-while-RHBZ-1715412-is-still-a.patch
@ -52,6 +48,8 @@ Requires: emacs-filesystem
%if 0%{?fedora} %if 0%{?fedora}
Requires: xemacs-filesystem Requires: xemacs-filesystem
%endif %endif
# Optionally support rpmautospec
Recommends: python%{python3_version}dist(rpmautospec)
%description %description
This package contains scripts and (X)Emacs support files to aid in This package contains scripts and (X)Emacs support files to aid in
@ -120,6 +118,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1
%changelog %changelog
* Sat Jul 17 2021 Neal Gompa <ngompa@fedoraproject.org> - 9.4-1
- Update to 9.4
* Mon Feb 15 2021 Miro Hrončok <mhroncok@redhat.com> - 9.3-5 * Mon Feb 15 2021 Miro Hrončok <mhroncok@redhat.com> - 9.3-5
- Require any Python version of the Python packages - Require any Python version of the Python packages

View File

@ -1 +1 @@
SHA512 (rpmdevtools-9.3.tar.xz) = 87dc8fe2885db2760a7520bc2486655f64e778bce0b6b3c2904ba9f3689e13f5b8d186b6fcebd60f24e958333aae66d06c0690fe2db633c2f508068dd4215f9f SHA512 (rpmdevtools-9.4.tar.xz) = 848e6d0df7ae7c42fba670eb22f869defff3aaabce0aa491e08bfcd1acfc93a1f0e1cef49d7d452ecda52b22f238a8aad6aa8402ca7d1ec5087fcd516a179e45