From 5eef8c298044c53903faef6e1cceb9b3651e4a5a56e58f045767474a5b57bfda Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 16 Mar 2021 10:47:17 +0000 Subject: [PATCH] - add fix-tests-libmix_differences-2.patch to fix a newline in the other upstream patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=12 --- diffoscope.changes | 5 +++++ diffoscope.spec | 7 +++++-- fix-tests-libmix_differences-2.patch | 9 +++++++++ fix-tests-libmix_differences.patch | 3 ++- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 fix-tests-libmix_differences-2.patch diff --git a/diffoscope.changes b/diffoscope.changes index a08b8a7..744d7b4 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 16 09:20:53 UTC 2021 - Sebastian Wagner + +- add fix-tests-libmix_differences-2.patch to fix a newline in the other upstream patch + ------------------------------------------------------------------- Mon Mar 15 21:08:35 UTC 2021 - Sebastian Wagner diff --git a/diffoscope.spec b/diffoscope.spec index badeb8b..d37b1b9 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -26,8 +26,10 @@ 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-tests-libmix_differences.patch -- fixes test_libmix_differences after https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/244 https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/fda75c731cd20383b15bcfc3326100b5ecd0787f.diff -Patch0: fix-tests-libmix_differences.patch +# PATCH-FIX-UPSTREAM fix-tests-libmix_differences.patch -- fixes test_libmix_differences https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/244 +Patch0: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/fda75c731cd20383b15bcfc3326100b5ecd0787f.diff#/fix-tests-libmix_differences.patch +# PATCH-FIX-UPSTREAM fix-tests-libmix_differences-2.patch -- fixes test_libmix_differences https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/244 +Patch1: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/27e27436ffad4ef35c2bde751001bef647c12caf.diff#/fix-tests-libmix_differences-2.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base >= 3.7 @@ -115,6 +117,7 @@ debbindiff. %setup -q sed -i '0,/#!\/usr\/bin\/env/ d' diffoscope/main.py %patch0 -p1 +%patch1 -p1 %build %python3_build diff --git a/fix-tests-libmix_differences-2.patch b/fix-tests-libmix_differences-2.patch new file mode 100644 index 0000000..04a66cd --- /dev/null +++ b/fix-tests-libmix_differences-2.patch @@ -0,0 +1,9 @@ +diff --git a/tests/data/elfmix_x_obj_objdump_expected_diff b/tests/data/elfmix_x_obj_objdump_expected_diff +index 1c0aace4c3be236262808f8d87336fcb68c3ec3e..e36b59703d1231667e6609a2f5e4b9264adc09be 100644 +--- a/tests/data/elfmix_x_obj_objdump_expected_diff ++++ b/tests/data/elfmix_x_obj_objdump_expected_diff +@@ -9,4 +9,3 @@ + - movi.n a2, 42 + + movi.n a2, 43 + retw.n +- diff --git a/fix-tests-libmix_differences.patch b/fix-tests-libmix_differences.patch index 42ee7a7..bea0da4 100644 --- a/fix-tests-libmix_differences.patch +++ b/fix-tests-libmix_differences.patch @@ -33,7 +33,7 @@ new file mode 100644 index 0000000000000000000000000000000000000000..1c0aace4c3be236262808f8d87336fcb68c3ec3e --- /dev/null +++ b/tests/data/elfmix_x_obj_objdump_expected_diff -@@ -0,0 +1,11 @@ +@@ -0,0 +1,12 @@ +@@ -3,9 +3,9 @@ + + Disassembly of section .text: @@ -45,3 +45,4 @@ index 0000000000000000000000000000000000000000..1c0aace4c3be236262808f8d87336fcb +- movi.n a2, 42 ++ movi.n a2, 43 + retw.n ++