diff --git a/velocity.spec b/velocity.spec index 58ac04d..fe6acc1 100644 --- a/velocity.spec +++ b/velocity.spec @@ -32,11 +32,8 @@ BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(org.apache.commons:commons-lang3) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(junit:junit) BuildRequires: mvn(oro:oro) BuildRequires: mvn(log4j:log4j:1.2.17) -BuildRequires: mvn(jaxen:jaxen) -BuildRequires: mvn(org.jdom:jdom) BuildRequires: mvn(org.apache:apache:pom:) @@ -100,6 +97,10 @@ rm src/test/org/apache/velocity/test/VelocityServletTestCase.java # This test doesn't work with new hsqldb rm src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java +# Anakia and Texen are not needed +rm -rf src/java/org/apache/velocity/anakia/ +rm -rf src/java/org/apache/velocity/texen/ + cp %{SOURCE1} ./pom.xml # remove rest of avalon logkit refences @@ -114,7 +115,7 @@ cp %{SOURCE1} ./pom.xml %patch3 -p1 # Use jdom instead of werken-xpath -%patch4 -p1 +#%patch4 -p1 %pom_remove_dep werken-xpath: # Skip Java 8 incompatible test @@ -143,18 +144,15 @@ commons-collections:commons-collections \ org.apache.commons:commons-lang3 \ commons-logging:commons-logging \ javax.servlet:javax.servlet-api \ -junit:junit \ oro:oro \ log4j:log4j:1.2.17 \ -jaxen:jaxen \ -org.jdom:jdom \ ) ant \ -buildfile build/build.xml \ -Dbuild.sysclasspath=first \ -Djavac.target=1.6 \ -Djavac.source=1.6 \ - jar javadocs test + jar javadocs test-main # fix line-endings in generated files sed -i 's/\r//' docs/api/stylesheet.css docs/api/package-list