[olfs] Use junit instead of junit4
Orion Poplawski
orion at fedoraproject.org
Thu May 22 18:08:02 UTC 2014
commit dfb54006726abad58a18599b08f46afb05cc7d11
Author: Orion Poplawski <orion at nwra.com>
Date: Thu May 22 12:07:57 2014 -0600
Use junit instead of junit4
olfs.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/olfs.spec b/olfs.spec
index 76909fa..1a3ba53 100644
--- a/olfs.spec
+++ b/olfs.spec
@@ -1,6 +1,6 @@
Name: olfs
Version: 1.9.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: OPeNDAP Lightweight Frontend Servlet - client interface for Hyrax
Group: System Environment/Daemons
@@ -21,7 +21,7 @@ BuildRequires: apache-commons-cli
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
BuildRequires: jdom
-BuildRequires: junit4
+BuildRequires: junit
BuildRequires: log4j
BuildRequires: logback
BuildRequires: saxon
@@ -42,7 +42,7 @@ Requires: apache-commons-cli
Requires: apache-commons-lang
Requires: apache-commons-logging
Requires: jdom
-Requires: junit4
+Requires: junit
Requires: log4j
Requires: logback
Requires: saxon
@@ -80,7 +80,7 @@ find -type f | xargs sed -i -e 's/[5]9 Temple Place,/51 Franklin Street,/' \
%build
export CLASSPATH=`build-classpath commons-cli commons-codec commons-httpclient \
- commons-lang commons-logging jdom junit4 log4j logback saxon \
+ commons-lang commons-logging jdom junit log4j logback saxon \
servlet slf4j/api tomcat/catalina.jar xalan-j2 xalan-j2-serializer`
ant -Dbuild.sysclasspath=$CLASSPATH server
@@ -118,7 +118,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/tomcat/webapps/opendap/docs \
%check
export CLASSPATH=`build-classpath commons-cli commons-codec commons-httpclient \
- commons-lang commons-logging jdom junit4 log4j logback saxon \
+ commons-lang commons-logging jdom junit log4j logback saxon \
servlet slf4j/api tomcat/catalina.jar xalan-j2 xalan-j2-serializer`
ant -lib $CLASSPATH check
@@ -137,6 +137,9 @@ ant -lib $CLASSPATH check
%changelog
+* Thu May 22 2014 Orion Poplawski <orion at cora.nwra.com> - 1.9.5-5
+- Use junit instead of junit4
+
* Fri Feb 21 2014 Orion Poplawski <orion at cora.nwra.com> - 1.9.5-4
- Require java-headless (bug #1068458)
More information about the scm-commits
mailing list