From d1077b053e74a84b0a57bf5fb402409d4b16f8358da06c9f5baebce70da3387f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Mar 2019 16:27:21 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-chain?expand=0&rev=4 --- apache-commons-chain.changes | 1 + apache-commons-chain.spec | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apache-commons-chain.changes b/apache-commons-chain.changes index 0b09ba4..93d6de7 100644 --- a/apache-commons-chain.changes +++ b/apache-commons-chain.changes @@ -3,6 +3,7 @@ Tue Mar 5 16:20:05 UTC 2019 - Fridrich Strba - Remove parent from the pom file, since it is pointless when not building with maven +- Make building with tests optional in order to speed-up rebuild ------------------------------------------------------------------- Fri Dec 21 20:58:36 UTC 2018 - Fridrich Strba diff --git a/apache-commons-chain.spec b/apache-commons-chain.spec index ef9f72e..e272bfd 100644 --- a/apache-commons-chain.spec +++ b/apache-commons-chain.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-chain # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,6 +18,7 @@ %global base_name chain %global short_name commons-%{base_name} +%bcond_with tests Name: apache-commons-chain Version: 1.2 Release: 0 @@ -35,20 +36,21 @@ Patch3: commons-chain-1.2-getdeps.patch # javax.servlet 4.0 api support Patch4: commons-chain-1.2-servlet4.patch BuildRequires: ant -BuildRequires: ant-junit BuildRequires: apache-commons-collections BuildRequires: commons-beanutils BuildRequires: commons-digester >= 1.8 BuildRequires: commons-logging BuildRequires: fdupes -BuildRequires: javapackages-local -BuildRequires: junit -BuildRequires: portlet-1.0-api BuildRequires: glassfish-servlet-api +BuildRequires: javapackages-local +BuildRequires: portlet-1.0-api Requires: mvn(commons-beanutils:commons-beanutils) Requires: mvn(commons-digester:commons-digester) >= 1.8 Requires: mvn(commons-logging:commons-logging) BuildArch: noarch +%if %{with tests} +BuildRequires: ant-junit +%endif %description A popular technique for organizing the execution of complex @@ -109,10 +111,12 @@ export CLASSPATH=$(build-classpath \ commons-beanutils \ commons-collections \ portlet-1.0-api \ - glassfish-servlet-api \ - junit) + glassfish-servlet-api) ant \ +%if %{without tests} + -Dmaven.test.skip=true \ +%endif -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dbuild.sysclasspath=first dist javadoc