[cobertura] Use junit instead of junit4
Orion Poplawski
orion at fedoraproject.org
Wed May 21 20:32:28 UTC 2014
commit 0e4b4060191e455fb02af43880ab1bd4f3ccb1d7
Author: Orion Poplawski <orion at nwra.com>
Date: Wed May 21 14:32:21 2014 -0600
Use junit instead of junit4
cobertura.spec | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/cobertura.spec b/cobertura.spec
index ee4f011..8852bc8 100644
--- a/cobertura.spec
+++ b/cobertura.spec
@@ -1,6 +1,6 @@
Name: cobertura
Version: 1.9.4.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Java tool that calculates the percentage of code accessed by tests
# ASL 2.0: src/net/sourceforge/cobertura/webapp/web.xml
@@ -31,7 +31,7 @@ BuildRequires: java-devel
BuildRequires: jakarta-oro
BuildRequires: jaxen
BuildRequires: jdom
-BuildRequires: junit4
+BuildRequires: junit
BuildRequires: log4j
BuildRequires: objectweb-asm3
BuildRequires: tomcat-servlet-3.0-api
@@ -42,7 +42,7 @@ BuildRequires: xml-commons-jaxp-1.3-apis
Requires: ant
Requires: java-headless
Requires: jakarta-oro
-Requires: junit4
+Requires: junit
Requires: log4j
Requires: objectweb-asm3
@@ -72,7 +72,7 @@ sed -i 's/\r//' ChangeLog COPYING COPYRIGHT README
pushd lib
ln -s $(build-classpath jaxen) .
ln -s $(build-classpath jdom) .
- ln -s $(build-classpath junit4) .
+ ln -s $(build-classpath junit) .
ln -s $(build-classpath log4j) .
ln -s $(build-classpath objectweb-asm3/asm-all) .
ln -s $(build-classpath oro) .
@@ -89,7 +89,7 @@ pushd antLibrary/common
ln -s $(build-classpath groovy) .
popd
-export CLASSPATH=$(build-classpath objectweb-asm3/asm-all commons-cli antlr junit4)
+export CLASSPATH=$(build-classpath objectweb-asm3/asm-all commons-cli antlr junit)
%ant -Djetty.dir=. -Dlib.dir=. compile test jar javadoc
%install
@@ -110,7 +110,7 @@ install -p -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}-runtime.pom
# ant config
install -d -m 755 %{buildroot}%{_sysconfdir}/ant.d
cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
-ant cobertura junit4 log4j oro xerces-j2
+ant cobertura junit log4j oro xerces-j2
EOF
# javadoc
@@ -126,6 +126,9 @@ cp -rp build/api/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Wed May 21 2014 Orion Poplawski <orion at cora.nwra.com> - 1.9.4.1-13
+- Use junit instead of junit4
+
* Wed May 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.9.4.1-12
- Use .mfiles generated during build
More information about the scm-commits
mailing list