From b5599890f640b222936cd777bacc9060ffc30a37 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sep 15 2018 08:46:55 +0000
Subject: Version 100


---

diff --git a/0001-tempfiles-empty-the-list-of-known-tempfiles-after-re.patch b/0001-tempfiles-empty-the-list-of-known-tempfiles-after-re.patch
deleted file mode 100644
index cd7086f..0000000
--- a/0001-tempfiles-empty-the-list-of-known-tempfiles-after-re.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a6b4effcfb24780d9d2d1b76efa33132381f76eb Mon Sep 17 00:00:00 2001
-From: Mattia Rizzolo <mattia@debian.org>
-Date: Sun, 1 Jul 2018 20:53:48 +0200
-Subject: [PATCH] tempfiles: empty the list of known tempfiles after removing
- them
-
-tempfiles would be cleaned up between tests, so the new "base directory"
-would be removed as well, that made the next tentative to create a temporary
-directory fail.
-
-This is not interesting for regular execution of diffoscope, as only
-programs executing diffoscope.main.main() twice within the same python
-process would notice.
-
-Closes: #902709
-Signed-off-by: Mattia Rizzolo <mattia@debian.org>
----
- diffoscope/tempfiles.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/diffoscope/tempfiles.py b/diffoscope/tempfiles.py
-index 4e4e93f3d9..83357d6d86 100644
---- a/diffoscope/tempfiles.py
-+++ b/diffoscope/tempfiles.py
-@@ -55,6 +55,7 @@ def clean_all_temp_files():
-             pass
-         except:
-             logger.exception("Unable to delete %s", x)
-+    _FILES.clear()
- 
-     logger.debug("Cleaning %d temporary directories", len(_DIRS))
- 
-@@ -75,6 +76,7 @@ def clean_all_temp_files():
-             pass
-         except:
-             logger.exception("Unable to delete %s", x)
-+    _DIRS.clear()
- 
- 
- def _get_base_temporary_directory():
diff --git a/diffoscope.spec b/diffoscope.spec
index 4a75023..1081d33 100644
--- a/diffoscope.spec
+++ b/diffoscope.spec
@@ -1,14 +1,13 @@
 Name:          diffoscope
-Version:       98
-Release:       2%{?dist}
+Version:       100
+Release:       1%{?dist}
 Summary:       In-depth comparison of files, archives, and directories
 License:       GPLv3+
 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
 
-Patch0001:     0001-tempfiles-empty-the-list-of-known-tempfiles-after-re.patch
-Patch0002:     0002-Fix-access-to-mtime-attribute-of-libarchive-entry.patch
+# Patch0002:     0002-Fix-access-to-mtime-attribute-of-libarchive-entry.patch
 
 %global tools \
     acl \
@@ -98,32 +97,13 @@ echo %{buildroot}%{python3_sitelib}
 install -Dm0644 -t %{buildroot}%{_mandir}/man1/ doc/diffoscope.1
 
 %check
-# disable some tests crudely
-# (https://github.com/pytest-dev/pytest/issues/1442#issuecomment-194259675)
-# http://bugs.debian.org/817193
-sed -i s/test_listing/_disabled_/ tests/comparators/test_cbfs.py
-sed -i s/test_identification_using_offset/_disabled_/ tests/comparators/test_cbfs.py
-sed -i s/test_compare_non_existing/_disabled_/ tests/comparators/test_cbfs.py
-sed -i s/test_identification/_disabled_/ tests/comparators/test_ppu.py
-sed -i s/test_diff/_disabled_/ tests/comparators/test_ppu.py
-sed -i s/test_compare_non_existing/_disabled_/ tests/comparators/test_ppu.py
-sed -i s/test_obj_compare_non_existing/_disabled_/ tests/comparators/test_elf.py
-sed -i s/test_differences_with_dbgsym/_disabled_/ tests/comparators/test_elf.py
-sed -i s/test_original_gnu_debuglink/_disabled_/ tests/comparators/test_elf.py
-sed -i s/test_diff/_disabled_/ tests/comparators/test_elf.py
-sed -i s/test_lib_differences/_disabled_/ tests/comparators/test_elf.py
-sed -i s/test_lib_compare_non_existing/_disabled_/ tests/comparators/test_elf.py
-sed -i s/test_differences/_disabled_/ tests/comparators/test_fsimage.py
-sed -i s/test_item1_elf/_disabled_/ tests/comparators/test_rlib.py
-sed -i s/test_identification/_disabled_/ tests/comparators/test_berkeley_db.py
-sed -i s/test_diff/_disabled_/ tests/comparators/test_berkeley_db.py
-sed -i s/test_compare_non_existing/_disabled_/ tests/comparators/test_berkeley_db.py
-sed -i s/test_diff/_disabled_/ tests/comparators/test_icc.py
-
 export LC_CTYPE=C.utf8
 export TZ=UTC
 export PYTHONPATH=build/lib/
-py.test-%{python3_version} tests/ -vv || :
+# Test results are ignored because there's minor differences in
+# formatting that break tests and the list of failing tests changes
+# with every release. One day I should fix this properly.
+%{__python3} -m pytest tests/ -vv || :
 
 %files
 %doc README.rst debian/changelog
@@ -133,6 +113,9 @@ py.test-%{python3_version} tests/ -vv || :
 %doc %{_mandir}/man1/diffoscope.1*
 
 %changelog
+* Sat Sep 15 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 100-1
+- Update to latest version
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 98-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild