diff --git a/.gitignore b/.gitignore index 4df22cd..c3d76b0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /diffoscope-95.tar.gz /diffoscope-96.tar.gz /diffoscope-98.tar.gz +/diffoscope-100.tar.gz diff --git a/0002-Fix-access-to-mtime-attribute-of-libarchive-entry.patch b/0002-Fix-access-to-mtime-attribute-of-libarchive-entry.patch deleted file mode 100644 index 7aaaaa3..0000000 --- a/0002-Fix-access-to-mtime-attribute-of-libarchive-entry.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dabda2823a0d161ff448fc5596c4c06fe3bb17e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 3 Jul 2018 12:46:04 +0200 -Subject: [PATCH] Fix access to mtime attribute of libarchive entry - -python-libarchive-c supports nanosecond timestamps by returning a float -if the nanoseconds are not 0. -See https://github.com/Changaco/python-libarchive-c/commit/d6a2ea3803e8b6a5aec30308a48501d281badbee. -There is no mtime_nsec attribute. ---- - diffoscope/comparators/utils/libarchive.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/diffoscope/comparators/utils/libarchive.py b/diffoscope/comparators/utils/libarchive.py -index f45092d40f..aebcaa320b 100644 ---- a/diffoscope/comparators/utils/libarchive.py -+++ b/diffoscope/comparators/utils/libarchive.py -@@ -96,7 +96,7 @@ def list_libarchive(path): - else: - size_or_dev = entry.size - mtime = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(entry.mtime) -- ) + '.{:06d}'.format(entry.mtime_nsec // 1000) -+ ) + '.{:06d}'.format(entry.mtime % 1000) - if entry.issym: - name_and_link = '{entry.name} -> {entry.linkname}'.format( - entry=entry) diff --git a/diffoscope.spec b/diffoscope.spec index 1727f1e..62e27e4 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -7,8 +7,6 @@ URL: https://diffoscope.org/ #Source0: https://files.pythonhosted.org/packages/source/d/diffoscope/diffoscope-%%{version}.tar.gz Source0: https://salsa.debian.org/reproducible-builds/diffoscope/-/archive/%{version}/diffoscope-%{version}.tar.gz -# Patch0002: 0002-Fix-access-to-mtime-attribute-of-libarchive-entry.patch - %global tools \ acl \ e2fsprogs \ diff --git a/sources b/sources index b1ca23f..0f90084 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (diffoscope-98.tar.gz) = 70a389ac7884fffe0f1f679952a8b8f5b3c876d582b9a9cd43b216e0afe0a162b7ccd2fec2e07054d7f6210abf2ff40534e0fce9b57c298c33cc115c02e01b8c +SHA512 (diffoscope-100.tar.gz) = b74417d82dd28a757dbb440f8fb138125c0de2f8dbb58a0d3cb1e443309185d0ca16c9c06f17e345ca290856b4749bbcf0db96a8012835c1d198c6b4a0ed87b4