diff --git a/.gitignore b/.gitignore index 9fae4b5..5013cc7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /diffoscope_54.tar.xz /diffoscope_58.tar.xz /diffoscope_59.tar.xz +/diffoscope_62.tar.xz diff --git a/diffoscope.spec b/diffoscope.spec index a13fe26..c1feaaf 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -1,5 +1,5 @@ Name: diffoscope -Version: 59 +Version: 62 Release: 1%{?dist} Summary: In-depth comparison of files, archives, and directories License: GPLv3+ @@ -9,14 +9,34 @@ Source0: http://ftp.debian.org/debian/pool/main/d/diffoscope/diffoscope_%{ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-pytest BuildRequires: python3-magic BuildRequires: python3-libguestfs -BuildRequires: python3-libguestfs BuildRequires: python3-libarchive-c BuildRequires: python3-docutils -BuildRequires: coreboot-utils BuildRequires: /usr/bin/rst2man +# for tests +BuildRequires: python3-pytest +BuildRequires: coreboot-utils +BuildRequires: cpio +BuildRequires: llvm, llvm-devel +BuildRequires: binutils +BuildRequires: unzip +BuildRequires: bzip2 +BuildRequires: xz +BuildRequires: genisoimage +BuildRequires: squashfs-tools +BuildRequires: java-devel +BuildRequires: /usr/bin/rpm2cpio +BuildRequires: /usr/bin/msgunfmt +BuildRequires: /usr/bin/ps2ascii +BuildRequires: /usr/bin/qemu-img +BuildRequires: /usr/bin/sqlite3 +BuildRequires: /usr/bin/xxd +BuildRequires: /usr/bin/ghc +BuildRequires: /usr/bin/pedump +BuildRequires: /usr/bin/ppudump +BuildRequires: /usr/bin/cd-iccdump + Requires: python3-magic Requires: python3-tlsh Requires: python3-libarchive-c @@ -32,8 +52,7 @@ diffoscope is developed as part of the "reproducible builds" Debian project and was formerly known as "debbindiff". %prep -%autosetup -find . -name '*.pyc' -print -delete +%autosetup -n diffoscope sed -i '1{\@/usr/bin/env@d}' diffoscope/main.py sed -i '1s|/usr/bin/env.*|%{__python3} -s|' bin/trydiffoscope @@ -47,14 +66,17 @@ rst2man debian/trydiffoscope.1.rst > build/trydiffoscope.1 install bin/trydiffoscope %buildroot%{_bindir} echo %{buildroot}%{python3_sitelib} rm %{buildroot}%{python3_sitelib}/*/requires.txt -install -Dm0644 build/diffoscope.1 %{buildroot}%{_mandir}/man1/diffoscope.1 -install -Dm0644 build/trydiffoscope.1 %{buildroot}%{_mandir}/man1/trydiffoscope.1 +install -Dm0644 -t %{buildroot}%{_mandir}/man1/ build/diffoscope.1 +install -Dm0644 -t %{buildroot}%{_mandir}/man1/ build/trydiffoscope.1 %check -# disable one test crudely +# disable some tests crudely # (https://github.com/pytest-dev/pytest/issues/1442#issuecomment-194259675) -sed -i s/test_differences/_disabled_/ tests/comparators/test_fsimage.py sed -i s/test_listing/_disabled_/ tests/comparators/test_cbfs.py +sed -i s/test_diff/_disabled_/ tests/comparators/test_icc.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 # http://bugs.debian.org/817193 export LC_CTYPE=en_US.utf8 @@ -72,6 +94,9 @@ py.test-%{python3_version} tests/ -vv %doc %{_mandir}/man1/trydiffoscope.1* %changelog +* Tue Nov 15 2016 Zbigniew Jędrzejewski-Szmek - 62-1 +- Update to latest version + * Mon Aug 15 2016 Zbigniew Jędrzejewski-Szmek - 59-1 - Update to latest version - Require python-libarchive-c (#1367034) diff --git a/sources b/sources index 5b187c0..5f6c0d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b46dc7ea981c3275bfa7e490b5027066 diffoscope_59.tar.xz +82470149594e108e1d14052af04e1e88 diffoscope_62.tar.xz