From ef45a62fd0e83cd6a381c56a8e2bb46eba82bab1ff45bd128bc7dab552c435bb Mon Sep 17 00:00:00 2001 From: Bernhard Wiedemann Date: Thu, 29 Dec 2016 06:48:37 +0000 Subject: [PATCH] update to version 0.029 + Add strip-nondeterminism-0.029-fix-apk.patch to fix tests OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/strip-nondeterminism?expand=0&rev=3 --- strip-nondeterminism-0.029-fix-apk.patch | 11 +++++++++++ strip-nondeterminism.changes | 6 ++++++ strip-nondeterminism.spec | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 strip-nondeterminism-0.029-fix-apk.patch diff --git a/strip-nondeterminism-0.029-fix-apk.patch b/strip-nondeterminism-0.029-fix-apk.patch new file mode 100644 index 0000000..5b6b5ac --- /dev/null +++ b/strip-nondeterminism-0.029-fix-apk.patch @@ -0,0 +1,11 @@ +--- strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm.orig 2016-12-22 10:52:33.000000000 +0000 ++++ strip-nondeterminism-0.029/lib/File/StripNondeterminism.pm 2016-12-29 06:36:46.380730000 +0000 +@@ -70,7 +70,7 @@ + } + # jar + if (m/\.(jar|war|hpi|apk)$/ +- && _get_file_type($_) =~ m/(Java|Zip) archive data/) { ++ && _get_file_type($_) =~ m/((Java|Zip) archive data)|(Microsoft OOXML)/) { + return \&File::StripNondeterminism::handlers::jar::normalize; + } + # javadoc diff --git a/strip-nondeterminism.changes b/strip-nondeterminism.changes index ecf2b17..37f9552 100644 --- a/strip-nondeterminism.changes +++ b/strip-nondeterminism.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 1 00:00:51 UTC 2017 - bwiedemann@suse.com + +- update to version 0.029 + + Add strip-nondeterminism-0.029-fix-apk.patch to fix tests + ------------------------------------------------------------------- Tue Mar 8 16:08:31 UTC 2016 - bwiedemann@suse.com diff --git a/strip-nondeterminism.spec b/strip-nondeterminism.spec index 559b507..7704de4 100644 --- a/strip-nondeterminism.spec +++ b/strip-nondeterminism.spec @@ -24,6 +24,8 @@ License: GPL-3.0+ Group: Development/Libraries/Perl Url: https://anonscm.debian.org/git/reproducible/strip-nondeterminism.git Source: strip-nondeterminism_%{version}.orig.tar.gz +# PATCH-FIX-OPENSUSE - apk files misdetected as OOXML +Patch0: strip-nondeterminism-0.029-fix-apk.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl-base @@ -46,14 +48,14 @@ and the strip-nondeterminism command line utility. %prep %setup -q -c -n %{name}-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__make} %{?_smp_mflags} %check -# 1 Test fails -%{__make} test || : +%{__make} test %install %perl_make_install