Fridrich Strba 2019-03-05 16:20:54 +00:00 committed by Git OBS Bridge
parent 25cec1e3c8
commit 832d2c8ebd
2 changed files with 13 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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
building with maven
-------------------------------------------------------------------
Fri Dec 21 20:58:36 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -37,7 +37,6 @@ Patch4: commons-chain-1.2-servlet4.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-parent
BuildRequires: commons-beanutils
BuildRequires: commons-digester >= 1.8
BuildRequires: commons-logging
@ -45,11 +44,10 @@ BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: junit
BuildRequires: portlet-1.0-api
BuildRequires: tomcat-servlet-4.0-api
Requires: apache-commons-parent
Requires: commons-beanutils
Requires: commons-digester >= 1.8
Requires: commons-logging
BuildRequires: glassfish-servlet-api
Requires: mvn(commons-beanutils:commons-beanutils)
Requires: mvn(commons-digester:commons-digester) >= 1.8
Requires: mvn(commons-logging:commons-logging)
BuildArch: noarch
%description
@ -102,6 +100,8 @@ rm -rf src/java/org/apache/commons/chain/web/faces
%pom_xpath_set "pom:dependency[pom:groupId = 'javax.servlet' ]/pom:artifactId" javax.servlet-api
%pom_xpath_set "pom:dependency[pom:groupId = 'javax.servlet' ]/pom:version" 3.1.0
%pom_remove_parent
%build
export CLASSPATH=$(build-classpath \
commons-logging \
@ -109,7 +109,7 @@ export CLASSPATH=$(build-classpath \
commons-beanutils \
commons-collections \
portlet-1.0-api \
tomcat-servlet-4.0-api \
glassfish-servlet-api \
junit)
ant \