Fridrich Strba 2019-03-05 16:27:21 +00:00 committed by Git OBS Bridge
parent 832d2c8ebd
commit d1077b053e
2 changed files with 12 additions and 7 deletions

View File

@ -3,6 +3,7 @@ Tue Mar 5 16:20:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove parent from the pom file, since it is pointless when not - Remove parent from the pom file, since it is pointless when not
building with maven building with maven
- Make building with tests optional in order to speed-up rebuild
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 21 20:58:36 UTC 2018 - Fridrich Strba <fstrba@suse.com> Fri Dec 21 20:58:36 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-chain # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,6 +18,7 @@
%global base_name chain %global base_name chain
%global short_name commons-%{base_name} %global short_name commons-%{base_name}
%bcond_with tests
Name: apache-commons-chain Name: apache-commons-chain
Version: 1.2 Version: 1.2
Release: 0 Release: 0
@ -35,20 +36,21 @@ Patch3: commons-chain-1.2-getdeps.patch
# javax.servlet 4.0 api support # javax.servlet 4.0 api support
Patch4: commons-chain-1.2-servlet4.patch Patch4: commons-chain-1.2-servlet4.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-collections BuildRequires: apache-commons-collections
BuildRequires: commons-beanutils BuildRequires: commons-beanutils
BuildRequires: commons-digester >= 1.8 BuildRequires: commons-digester >= 1.8
BuildRequires: commons-logging BuildRequires: commons-logging
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: portlet-1.0-api
BuildRequires: glassfish-servlet-api BuildRequires: glassfish-servlet-api
BuildRequires: javapackages-local
BuildRequires: portlet-1.0-api
Requires: mvn(commons-beanutils:commons-beanutils) Requires: mvn(commons-beanutils:commons-beanutils)
Requires: mvn(commons-digester:commons-digester) >= 1.8 Requires: mvn(commons-digester:commons-digester) >= 1.8
Requires: mvn(commons-logging:commons-logging) Requires: mvn(commons-logging:commons-logging)
BuildArch: noarch BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
%endif
%description %description
A popular technique for organizing the execution of complex A popular technique for organizing the execution of complex
@ -109,10 +111,12 @@ export CLASSPATH=$(build-classpath \
commons-beanutils \ commons-beanutils \
commons-collections \ commons-collections \
portlet-1.0-api \ portlet-1.0-api \
glassfish-servlet-api \ glassfish-servlet-api)
junit)
ant \ ant \
%if %{without tests}
-Dmaven.test.skip=true \
%endif
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dbuild.sysclasspath=first dist javadoc -Dbuild.sysclasspath=first dist javadoc