From 5e967f521360698ce9befc706f1c53d84ca42a75 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Dec 02 2019 18:56:50 +0000
Subject: Update to v133 and fix tests


---

diff --git a/0001-tests-make-test_cbfs-test_listing-pass-on-Fedora.patch b/0001-tests-make-test_cbfs-test_listing-pass-on-Fedora.patch
new file mode 100644
index 0000000..032eded
--- /dev/null
+++ b/0001-tests-make-test_cbfs-test_listing-pass-on-Fedora.patch
@@ -0,0 +1,36 @@
+From 57cff5e64fbbbae2b65fce137d01aa0a3addea7b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sun, 1 Dec 2019 18:50:12 +0100
+Subject: [PATCH] tests: make test_cbfs::test_listing pass on Fedora
+
+---
+ tests/comparators/test_cbfs.py               | 1 +
+ tests/data/cbfs_listing_expected_fedora.diff | 7 +++++++
+ 2 files changed, 8 insertions(+)
+ create mode 100644 tests/data/cbfs_listing_expected_fedora.diff
+
+diff --git a/tests/comparators/test_cbfs.py b/tests/comparators/test_cbfs.py
+index d08578856f..3e0696b06d 100644
+--- a/tests/comparators/test_cbfs.py
++++ b/tests/comparators/test_cbfs.py
+@@ -130,6 +130,7 @@ def test_listing(differences):
+         get_data('cbfs_listing_expected_diff'),
+         get_data('cbfs_listing_no_legacy_header_expected_diff'),
+         get_data('cbfs_listing_comp_column_expected.diff'),  # cbfs >= 4.6
++        get_data('cbfs_listing_expected_fedora.diff'),  # cbfs >= 4.9?
+     )
+ 
+ 
+diff --git a/tests/data/cbfs_listing_expected_fedora.diff b/tests/data/cbfs_listing_expected_fedora.diff
+new file mode 100644
+index 0000000000..8c0301f2e3
+--- /dev/null
++++ b/tests/data/cbfs_listing_expected_fedora.diff
+@@ -0,0 +1,7 @@
++@@ -1,4 +1,4 @@
++ FMAP REGION: COREBOOT
++ Name                           Offset     Type           Size   Comp
++-text                           0x0        raw               446 none
++-(empty)                        0x200      null            32152 none
+++text                           0x0        raw               671 none
+++(empty)                        0x300      null            31896 none
diff --git a/diffoscope.spec b/diffoscope.spec
index 8a8e16e..3256498 100644
--- a/diffoscope.spec
+++ b/diffoscope.spec
@@ -1,14 +1,17 @@
 Name:          diffoscope
-Version:       111
-Release:       4%{?dist}
+Version:       133
+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
+Patch0:        0001-tests-make-test_cbfs-test_listing-pass-on-Fedora.patch
 
 %global tools \
     acl \
+    abootimg \
+    black \
     e2fsprogs \
     cpio \
     llvm, llvm-devel \
@@ -27,6 +30,7 @@ Source0:       https://salsa.debian.org/reproducible-builds/diffoscope/-/archive
     genisoimage \
     squashfs-tools \
     java-devel \
+    xmlbeans \
     /usr/bin/img2txt \
     /usr/bin/rpm2cpio \
     /usr/bin/msgunfmt \
@@ -35,19 +39,29 @@ Source0:       https://salsa.debian.org/reproducible-builds/diffoscope/-/archive
     /usr/bin/xxd \
     /usr/bin/ghc \
     /usr/bin/cd-iccdump \
+    /usr/bin/oggDump \
+    /usr/bin/ppudump \
+    /usr/bin/Rscript \
+    /usr/bin/dumpxsb \
+    /usr/bin/fdtdump \
+    /usr/bin/gifbuild \
     gnupg \
+    pgpdump \
     findutils \
     file \
     ImageMagick \
     poppler-utils \
     python3-debian \
+    python3-PyPDF2 \
     enjarify \
-    gnumeric
+    gnumeric \
+    odt2txt \
+    wabt \
+    fpc
 
 # missing:
 # apktool
 # js-beautify
-# wasm2wat
 
 %ifnarch ppc64 ppc64le
 %global tools2 \
@@ -100,13 +114,21 @@ echo %{buildroot}%{python3_sitelib}
 install -Dm0644 -t %{buildroot}%{_mandir}/man1/ doc/diffoscope.1
 
 %check
-export LC_CTYPE=C.utf8
-export TZ=UTC
-export PYTHONPATH=build/lib/
-# 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 || :
+DESELECT=(
+  # This is fixed in oggvideotools-0.9.1. Let's ignore the test until
+  # we have the update.
+  --deselect=tests/comparators/test_ogg.py::test_diff
+
+  # https://bugzilla.redhat.com/show_bug.cgi?id=1778875
+  # https://salsa.debian.org/reproducible-builds/diffoscope/issues/9
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=877724
+  --deselect=tests/comparators/test_ppu.py::test_diff
+)
+
+LC_CTYPE=C.utf8 \
+TZ=UTC \
+PYTHONPATH=build/lib/ \
+%{__python3} -m pytest tests/ -vv ${DESELECT[@]}
 
 %files
 %doc README.rst debian/changelog
@@ -116,6 +138,9 @@ export PYTHONPATH=build/lib/
 %doc %{_mandir}/man1/diffoscope.1*
 
 %changelog
+* Sun Dec  1 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 133-1
+- Update to latest version
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 111-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)