Drop jsp/servlet api dependencies, leftovers from the past.

This commit is contained in:
Alexander Kurtakov 2012-03-16 23:47:04 +02:00
parent a778a8b7a5
commit 2547638b4a
1 changed files with 8 additions and 10 deletions

View File

@ -30,11 +30,11 @@
Name: bsf Name: bsf
Version: 2.4.0 Version: 2.4.0
Release: 11%{?dist} Release: 12%{?dist}
Epoch: 0 Epoch: 0
Summary: Bean Scripting Framework Summary: Bean Scripting Framework
License: ASL 2.0 License: ASL 2.0
URL: http://jakarta.apache.org/bsf/ URL: http://commons.apache.org/bsf/
Group: Development/Libraries Group: Development/Libraries
Source0: http://apache.osuosl.org/jakarta/%{name}/source/%{name}-src-%{version}.tar.gz Source0: http://apache.osuosl.org/jakarta/%{name}/source/%{name}-src-%{version}.tar.gz
Source1: %{name}-pom.xml Source1: %{name}-pom.xml
@ -42,16 +42,12 @@ Patch0: build-file.patch
Patch1: build.properties.patch Patch1: build.properties.patch
BuildRequires: jpackage-utils >= 1.6 BuildRequires: jpackage-utils >= 1.6
BuildRequires: ant BuildRequires: ant
BuildRequires: servlet6
BuildRequires: tomcat6-jsp-2.1-api
BuildRequires: xalan-j2 BuildRequires: xalan-j2
BuildRequires: jython BuildRequires: jython
BuildRequires: apache-commons-logging
BuildRequires: rhino BuildRequires: rhino
Requires: apache-commons-logging BuildRequires: apache-commons-logging
Requires: servlet6
Requires: xalan-j2 Requires: xalan-j2
Requires: tomcat6-jsp-2.1-api Requires: apache-commons-logging
Requires: jpackage-utils Requires: jpackage-utils
BuildArch: noarch BuildArch: noarch
@ -100,13 +96,12 @@ find . -name "*.jar" -exec %{__rm} -f {} \;
%build %build
[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
export CLASSPATH=$(build-classpath apache-commons-logging jython xalan-j2 servlet jsp rhino) export CLASSPATH=$(build-classpath apache-commons-logging jython xalan-j2 rhino)
ant jar ant jar
%{__rm} -rf bsf/src/org/apache/bsf/engines/java %{__rm} -rf bsf/src/org/apache/bsf/engines/java
ant javadocs ant javadocs
%install %install
%{__rm} -fr %{buildroot}
# jar # jar
%{__install} -d -m 755 %{buildroot}%{_javadir} %{__install} -d -m 755 %{buildroot}%{_javadir}
%{__install} -m 644 build/lib/%{name}.jar \ %{__install} -m 644 build/lib/%{name}.jar \
@ -134,6 +129,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Fri Mar 16 2012 Alexander Kurtakov <akurtako@redhat.com> 0:2.4.0-12
- Drop jsp/servlet api dependencies, leftovers from the past.
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-11 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild