diff --git a/apache-commons-chain.changes b/apache-commons-chain.changes index 7064ebf..0b09ba4 100644 --- a/apache-commons-chain.changes +++ b/apache-commons-chain.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Fri Dec 21 20:58:36 UTC 2018 - Fridrich Strba diff --git a/apache-commons-chain.spec b/apache-commons-chain.spec index 0939d30..ef9f72e 100644 --- a/apache-commons-chain.spec +++ b/apache-commons-chain.spec @@ -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 \