From 80475b25646a4dade0ab2b6f32a6053b861bc80d022bbbeb0c64d299499a8c84 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Mar 2021 09:24:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=48 --- apache-commons-logging.changes | 7 +++++++ apache-commons-logging.spec | 8 +++++++- no-tests.patch | 11 +++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 no-tests.patch diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes index c0150e3..415c4b7 100644 --- a/apache-commons-logging.changes +++ b/apache-commons-logging.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 24 09:22:40 UTC 2021 - Fridrich Strba + +- Added patch + * no-tests.patch + + ignore failing tests for arm6 + ------------------------------------------------------------------- Tue Oct 1 08:45:20 UTC 2019 - Fridrich Strba diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec index 823df30..55ae631 100644 --- a/apache-commons-logging.spec +++ b/apache-commons-logging.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-logging # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2007, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -17,6 +17,7 @@ # +%{!?arm6:%global arm6 armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl} %define base_name logging %define short_name commons-%{base_name} Name: apache-%{short_name} @@ -32,6 +33,7 @@ Source4: http://central.maven.org/maven2/%{short_name}/%{short_name}-api/ Patch0: commons-logging-1.1.3-src-junit.diff Patch1: commons-logging-1.2-sourcetarget.patch Patch2: commons-logging-manifests.patch +Patch3: no-tests.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: glassfish-servlet-api @@ -62,6 +64,10 @@ logging implementation. %patch0 -p1 %patch1 -p1 %patch2 -p1 +# Disable tests on arm6 +%ifarch %{arm6} +%patch3 -p1 +%endif sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt diff --git a/no-tests.patch b/no-tests.patch new file mode 100644 index 0000000..985c44e --- /dev/null +++ b/no-tests.patch @@ -0,0 +1,11 @@ +--- commons-logging-1.2-src/build.xml 2014-07-05 20:11:36.000000000 +0200 ++++ commons-logging-1.2-src/build.xml 2021-03-24 10:17:33.609764305 +0100 +@@ -613,7 +613,7 @@ + + + +- + +