From 89f56066a8fab6440a333525d1e30c6933375157f2195a4910501b948bbf21d7 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 1 Nov 2023 18:28:42 +0000 Subject: [PATCH] Accepting request 1121667 from home:amanzini:branches:devel:languages:python - removed patch fix-file-5.45.patch as included in upstream - Update to version 251: * If the equivalent of `file -i` returns text/plain, fallback to comparing this file as a text file. This especially helps when file(1) miscategorises text files as some esoteric type. - Update to version 250: * Fix compatibility with file 5.45. * Add external tool references for GNU Guix (for html2text and ttx). - Update to version 249: * Add specialize_as() method, and use it to speed up .smali comparison in APKs. * Add documentation for the new specialize_as, and expand the documentation of `specialize` too. * Correct typos in diffoscope/presenters/utils.py. - Update to version 246: * Add support for LLVM 16. - Update to version 244: * Address compatibility with python-libarchive-c version 5. * Testsuite changes - Update to version 243: * Improve the documentation on to produce that binary blob that in the arsc comparator. OBS-URL: https://build.opensuse.org/request/show/1121667 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=90 --- diffoscope-242.tar.bz2 | 3 -- diffoscope-242.tar.bz2.asc | 16 ------ diffoscope-251.tar.bz2 | 3 ++ diffoscope-251.tar.bz2.asc | 16 ++++++ diffoscope.changes | 30 +++++++++++ diffoscope.spec | 7 +-- fix-file-5.45.patch | 103 ------------------------------------- 7 files changed, 51 insertions(+), 127 deletions(-) delete mode 100644 diffoscope-242.tar.bz2 delete mode 100644 diffoscope-242.tar.bz2.asc create mode 100644 diffoscope-251.tar.bz2 create mode 100644 diffoscope-251.tar.bz2.asc delete mode 100644 fix-file-5.45.patch diff --git a/diffoscope-242.tar.bz2 b/diffoscope-242.tar.bz2 deleted file mode 100644 index 7778759..0000000 --- a/diffoscope-242.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12640cffdc027912aabdf17f18e744b4401970bc150e7bf0bcebdc578654c1e1 -size 3088079 diff --git a/diffoscope-242.tar.bz2.asc b/diffoscope-242.tar.bz2.asc deleted file mode 100644 index 058f482..0000000 --- a/diffoscope-242.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmRVU5kACgkQHpU+J9Qx -HlhWYg//bw180WwB+ZiwmCXfF4L4WZUJo6YlAHdeA2G+dvZ1j32etJ1d7Bq5D5a9 -TJXijycPbkzz3YPzdp9paVLSbIH3fXWPteqTJym3HDCoWrj5tqWxdu3lbfLlPekE -lCXDJorHwrJoKIxXEkgTm4of4fC0iJg5nhrEmx/djgCeIs2dxOuL9oDO5Me0CHc1 -hjg1YA5ifzCvPXBlspTWImC6MZxg0wWwa5yMTDkabqnyk15tTlvTihqAvBYds0TJ -t8OfOAVNCrWoKtXS4k4SJyuRdgijFlwgUjVn0+FSJGgSQ3q+Fyb0Xp5bQJsypmAL -6M+MPVCcjQ+rVsq5osFkp5o0uRfYtMHucu2YHfdmbI53QI9tfUYNUSEm6z+p/Exb -Eg20z2+YzxmKmF27a/OY7VVWrplFYaVCExziDzsWEbqvv1rA2X5UOZY4gBi9sZhr -LFKBTmPzbswE0x31TAo4njFuu77gipJYia+QOFXEvlvoiyhkUB7ssISZyzxWrEGj -sWCwN+6UZZAdY6yDS9+NdSJDvocbiFkb6zgor1UuSxJM2jjbWVJ/okIeYFrH8MEb -8N/Go1znWmALZS/ZNVpnnz6SMsrHYa8cVPixfm/XMeDzukwS2GoCOXyVQ08d+rdf -wAkOrfrRu8VTMrggZb7A1YI7D3W4gvF+HndbapaFB/vQvBZ7Nck= -=Bb8v ------END PGP SIGNATURE----- diff --git a/diffoscope-251.tar.bz2 b/diffoscope-251.tar.bz2 new file mode 100644 index 0000000..f1c72ce --- /dev/null +++ b/diffoscope-251.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee8005c732cb11db3d488d7817cf104618ab6ffde98d786619a5b4496520a6fe +size 3095764 diff --git a/diffoscope-251.tar.bz2.asc b/diffoscope-251.tar.bz2.asc new file mode 100644 index 0000000..1c30b0b --- /dev/null +++ b/diffoscope-251.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmUo+OIACgkQHpU+J9Qx +HlghnA/9HzS4msedatmezOWDxIA7RTjY+cdzQ7DQL143S/KJ7C8Zuh6m5liYe8DV +RwoQtklN4vKAY1lRatLQbgdTzEOX/DfTCu4Ot/Q08prmJECOwYV9yCmzSoWcbq/3 +pUxKIbIN9FDctybHx2wzdHbco+spaiNL9QohJv2g3rHw18+KELfbFw2HIK6n+s3o +xzPD1qvHGDmmuOYkrJx5YUYnvwnhkgNN3Mtzpfwzzw7veJ8JKTPT1Sw+T8jScj9c +KZqX1ohdwRLU4cs1EhdtErVMUe8KBdXcvyvGNmJVeMT9cl39efMblxyev3SVdZCN +/Xk/WTmHsT0dYLpzggku7oS5Oh7laGKHIl1xoC1FOEteW+IE5ytZmes4PfC8sA+t +Bvim7ekevfk2Qv7izGLwQPchXC5x0JaTqp65fmo7crmfnNZHK2K/FaQPn3TddAxC +Fp27kvDWs/pXykbfnT2AMkHvkNi5lARCeZf1+xv9euS8p2TnViosqPYATwAY3Ljv +p6+7bVD4wvEXqyer4Ru+0D6spq85vUTVwVQ6Gvki5NTOXHQ+rlu5SYpwI3bGxOgE +KhmJqbzdaPB3i3Fwq74D7yuSEEyKzenfQelVX7OeZnDAS68GcKG5wiZ4EYNe6LGo +1KvifnKekB7Cf5SKrsEUQC5PJ/NXjtz2FrHqQiccs/lnoEH6hCM= +=wwtm +-----END PGP SIGNATURE----- diff --git a/diffoscope.changes b/diffoscope.changes index 135392e..941d1a0 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Wed Nov 1 17:44:17 UTC 2023 - Andrea Manzini + +- removed patch fix-file-5.45.patch as included in upstream + +- Update to version 251: + * If the equivalent of `file -i` returns text/plain, fallback to comparing + this file as a text file. This especially helps when file(1) miscategorises + text files as some esoteric type. + +- Update to version 250: + * Fix compatibility with file 5.45. + * Add external tool references for GNU Guix (for html2text and ttx). + +- Update to version 249: + * Add specialize_as() method, and use it to speed up .smali comparison in APKs. + * Add documentation for the new specialize_as, and expand the documentation + of `specialize` too. + * Correct typos in diffoscope/presenters/utils.py. + +- Update to version 246: + * Add support for LLVM 16. + +- Update to version 244: + * Address compatibility with python-libarchive-c version 5. + * Testsuite changes + +- Update to version 243: + * Improve the documentation on to produce that binary blob that in the arsc comparator. + ------------------------------------------------------------------- Sat Aug 5 07:58:48 UTC 2023 - Sebastian Wagner diff --git a/diffoscope.spec b/diffoscope.spec index 3d61daf..6079fe3 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -17,7 +17,7 @@ Name: diffoscope -Version: 242 +Version: 251 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later @@ -26,8 +26,6 @@ URL: https://diffoscope.org/ Source0: https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2 Source1: https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2.asc Source2: diffoscope.keyring -# PATCH-FIX-UPSTREAM fix-file-5.45.patch -- fix compatibility with file version 5.45, see https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/346 -Patch0: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/435a8fe9a201a7e74e705e06cc56b66fa6cb4af9.patch#/fix-file-5.45.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base >= 3.7 @@ -112,8 +110,7 @@ package produce different outputs. diffoscope was previously named debbindiff. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 sed -i '0,/#!\/usr\/bin\/env/ d' diffoscope/main.py %build diff --git a/fix-file-5.45.patch b/fix-file-5.45.patch deleted file mode 100644 index 12cc6b9..0000000 --- a/fix-file-5.45.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 435a8fe9a201a7e74e705e06cc56b66fa6cb4af9 Mon Sep 17 00:00:00 2001 -From: Chris Lamb -Date: Tue, 1 Aug 2023 11:11:13 +0100 -Subject: [PATCH] Fix compataibility with file 5.45. (Closes: - reproducible-builds/diffoscope#346) - ---- - tests/comparators/test_cpio.py | 19 ++++++++++++------- - tests/comparators/test_uimage.py | 20 +++++++++++++------- - 2 files changed, 25 insertions(+), 14 deletions(-) - -diff --git a/tests/comparators/test_cpio.py b/tests/comparators/test_cpio.py -index fce0b9b3..022aede7 100644 ---- a/tests/comparators/test_cpio.py -+++ b/tests/comparators/test_cpio.py -@@ -22,7 +22,10 @@ import pytest - from diffoscope.comparators.cpio import CpioFile - - from ..utils.data import load_fixture, get_data --from ..utils.tools import skip_unless_tools_exist -+from ..utils.tools import ( -+ skip_unless_tools_exist, -+ skip_unless_file_version_is_at_least, -+) - from ..utils.nonexisting import assert_non_existing - - cpio1 = load_fixture("test1.cpio") -@@ -51,19 +54,21 @@ def test_listing(differences): - - - @skip_unless_tools_exist("cpio") -+@skip_unless_file_version_is_at_least("5.45") - def test_symlink(differences): -- assert differences[1].source1 == "dir/link" -- assert differences[1].comment == "symlink" -+ assert differences[2].source1 == "dir/link" -+ assert differences[2].comment == "symlink" - expected_diff = get_data("symlink_expected_diff") -- assert differences[1].unified_diff == expected_diff -+ assert differences[2].unified_diff == expected_diff - - - @skip_unless_tools_exist("cpio") -+@skip_unless_file_version_is_at_least("5.45") - def test_compressed_files(differences): -- assert differences[2].source1 == "dir/text" -- assert differences[2].source2 == "dir/text" -+ assert differences[3].source1 == "dir/text" -+ assert differences[3].source2 == "dir/text" - expected_diff = get_data("text_ascii_expected_diff") -- assert differences[2].unified_diff == expected_diff -+ assert differences[3].unified_diff == expected_diff - - - @skip_unless_tools_exist("cpio") -diff --git a/tests/comparators/test_uimage.py b/tests/comparators/test_uimage.py -index 9ffcdc6f..2a8574ff 100644 ---- a/tests/comparators/test_uimage.py -+++ b/tests/comparators/test_uimage.py -@@ -24,7 +24,11 @@ from diffoscope.comparators.uimage import UimageFile - from diffoscope.comparators.utils.specialize import specialize - - from ..utils.data import load_fixture, get_data, assert_diff --from ..utils.tools import skip_unless_tools_exist, file_version_is_lt -+from ..utils.tools import ( -+ skip_unless_tools_exist, -+ file_version_is_lt, -+ skip_unless_file_version_is_at_least, -+) - from ..utils.nonexisting import assert_non_existing - - cpio1 = load_fixture("test1.cpio") -@@ -113,19 +117,21 @@ def test_nested_listing(nested_differences): - - - @skip_unless_tools_exist("cpio") -+@skip_unless_file_version_is_at_least("5.45") - def test_nested_symlink(nested_differences): -- assert nested_differences[1].source1 == "dir/link" -- assert nested_differences[1].comment == "symlink" -+ assert nested_differences[2].source1 == "dir/link" -+ assert nested_differences[2].comment == "symlink" - expected_diff = get_data("symlink_expected_diff") -- assert nested_differences[1].unified_diff == expected_diff -+ assert nested_differences[2].unified_diff == expected_diff - - - @skip_unless_tools_exist("cpio") -+@skip_unless_file_version_is_at_least("5.45") - def test_nested_compressed_files(nested_differences): -- assert nested_differences[2].source1 == "dir/text" -- assert nested_differences[2].source2 == "dir/text" -+ assert nested_differences[3].source1 == "dir/text" -+ assert nested_differences[3].source2 == "dir/text" - expected_diff = get_data("text_ascii_expected_diff") -- assert nested_differences[2].unified_diff == expected_diff -+ assert nested_differences[3].unified_diff == expected_diff - - - @skip_unless_tools_exist("cpio") --- -GitLab -