Fix BR after jakarta-commons rename

This commit is contained in:
Stanislav Ochotnicky 2010-06-07 15:55:46 +00:00
parent 17093b0f94
commit 3f842fcb7d
1 changed files with 7 additions and 4 deletions

View File

@ -30,7 +30,7 @@
Name: bsf
Version: 2.4.0
Release: 5%{?dist}
Release: 6%{?dist}
Epoch: 0
Summary: Bean Scripting Framework
License: ASL 2.0
@ -46,8 +46,8 @@ BuildRequires: servlet6
BuildRequires: tomcat6-jsp-2.1-api
BuildRequires: xalan-j2
BuildRequires: jython
BuildRequires: jakarta-commons-logging
Requires: jakarta-commons-logging
BuildRequires: apache-commons-logging
Requires: apache-commons-logging
Requires: servlet6
Requires: xalan-j2
Requires: tomcat6-jsp-2.1-api
@ -99,7 +99,7 @@ find . -name "*.jar" -exec %{__rm} -f {} \;
%build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
export CLASSPATH=$(build-classpath jakarta-commons-logging jython xalan-j2 servlet jsp)
export CLASSPATH=$(build-classpath apache-commons-logging jython xalan-j2 servlet jsp)
ant jar
%{__rm} -rf bsf/src/org/apache/bsf/engines/java
ant javadocs
@ -133,6 +133,9 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
* Mon Jun 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.4.0-6
- Fix BR after jakarta-commons rename
* Wed Apr 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:2.4.0-5
- Drop gcj support.
- Build against servlet and jsp apis from tomcat6.