[jdom2] disable coverage task

gil gil at fedoraproject.org
Mon Jun 9 00:39:29 UTC 2014


commit 548e7ce1771ef8452f3c796ee39632d4615f405e
Author: gil <puntogil at libero.it>
Date:   Mon Jun 9 02:39:13 2014 +0200

    disable coverage task

 jdom2.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/jdom2.spec b/jdom2.spec
index 1fbf3cb..d13af73 100644
--- a/jdom2.spec
+++ b/jdom2.spec
@@ -19,19 +19,19 @@ Patch1:        jdom-2.0.5-java8.patch
 BuildRequires: java-devel
 BuildRequires: java-javadoc
 BuildRequires: jpackage-utils
-
 BuildRequires: ant
 BuildRequires: ant-junit
 BuildRequires: bea-stax-api
-BuildRequires: cobertura
 BuildRequires: isorelax
-BuildRequires: jakarta-oro
 BuildRequires: jaxen
-BuildRequires: log4j12
-BuildRequires: objectweb-asm3
 BuildRequires: xalan-j2
 BuildRequires: xerces-j2
 BuildRequires: xml-commons-apis
+# coverage deps
+#BuildRequires: cobertura
+#BuildRequires: jakarta-oro
+#BuildRequires: log4j12
+#BuildRequires: objectweb-asm3
 
 Requires:      jpackage-utils
 
@@ -64,8 +64,8 @@ find . -name "*.class" -print -delete
 find . -name "*.jar" -print -delete
 
 %patch0 -p0
-sed -i.asm "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml
-sed -i.log4j "s|log4j.jar|log4j12-1.2.17.jar|" build.xml
+#sed -i.asm "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml
+#sed -i.log4j "s|log4j.jar|log4j12-1.2.17.jar|" build.xml
 %patch1 -p1
 
 cp -p %{SOURCE1} maven/contrib.pom
@@ -73,9 +73,11 @@ cp -p %{SOURCE2} maven/junit.pom
 
 sed -i 's/\r//' LICENSE.txt README.txt
 
+# Unable to run coverage: use log4j12 but switch to log4j 2.x
+sed -i.coverage "s|coverage, jars|jars|" build.xml
+
 %build
 
-export CLASSPATH=$(build-classpath log4j12-1.2.17)
 ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
 
 %install


More information about the scm-commits mailing list