pool/diffoscope
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add fix-tests-libmix_differences-2.patch to fix a newline in the other upstream patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/diffoscope?expand=0&rev=12
This commit is contained in:
Sebastian Wagner 2021-03-16 10:47:17 +00:00 committed by Git OBS Bridge
parent 88f4b01d49
commit 5eef8c2980
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diffoscope.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 16 09:20:53 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
- 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 <sebix+novell.com@sebix.at> Mon Mar 15 21:08:35 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>

7
diffoscope.spec
View File

@ -26,8 +26,10 @@ URL: https://diffoscope.org/
Source0: https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2 Source0: https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2
Source1: https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2.asc Source1: https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2.asc
Source2: diffoscope.keyring 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 # PATCH-FIX-UPSTREAM fix-tests-libmix_differences.patch -- fixes test_libmix_differences https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/244
Patch0: fix-tests-libmix_differences.patch 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: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: python3-base >= 3.7 BuildRequires: python3-base >= 3.7
@ -115,6 +117,7 @@ debbindiff.
%setup -q %setup -q
sed -i '0,/#!\/usr\/bin\/env/ d' diffoscope/main.py sed -i '0,/#!\/usr\/bin\/env/ d' diffoscope/main.py
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%python3_build %python3_build

9
fix-tests-libmix_differences-2.patch Normal file
View File

@ -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
-

3
fix-tests-libmix_differences.patch
View File

@ -33,7 +33,7 @@ new file mode 100644
index 0000000000000000000000000000000000000000..1c0aace4c3be236262808f8d87336fcb68c3ec3e index 0000000000000000000000000000000000000000..1c0aace4c3be236262808f8d87336fcb68c3ec3e
--- /dev/null --- /dev/null
+++ b/tests/data/elfmix_x_obj_objdump_expected_diff +++ b/tests/data/elfmix_x_obj_objdump_expected_diff
@@ -0,0 +1,11 @@ @@ -0,0 +1,12 @@
+@@ -3,9 +3,9 @@ +@@ -3,9 +3,9 @@
+ +
+ Disassembly of section .text: + Disassembly of section .text:
@ -45,3 +45,4 @@ index 0000000000000000000000000000000000000000..1c0aace4c3be236262808f8d87336fcb
+- movi.n a2, 42 +- movi.n a2, 42
++ movi.n a2, 43 ++ movi.n a2, 43
+ retw.n + retw.n
+