rpms/tomcat
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Removing unused dependency, apache-commons-collections, which was removed from upstream's build in r783696

Browse Source
This commit is contained in:
Coty Sutherland 2019-02-21 12:52:37 -05:00
parent 07b8ade141
commit fd75e507d2
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tomcat.spec
View File

@ -92,7 +92,6 @@ BuildArch: noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: ecj >= 1:4.6.1 BuildRequires: ecj >= 1:4.6.1
BuildRequires: findutils BuildRequires: findutils
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-daemon BuildRequires: apache-commons-daemon
BuildRequires: apache-commons-dbcp BuildRequires: apache-commons-dbcp
BuildRequires: apache-commons-pool BuildRequires: apache-commons-pool
@ -113,7 +112,6 @@ BuildRequires: wsdl4j
BuildRequires: systemd BuildRequires: systemd
Requires: apache-commons-daemon Requires: apache-commons-daemon
Requires: apache-commons-collections
Requires: apache-commons-dbcp Requires: apache-commons-dbcp
Requires: apache-commons-pool Requires: apache-commons-pool
Requires: java-headless >= 1:1.8.0 Requires: java-headless >= 1:1.8.0
@ -186,7 +184,6 @@ Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release} Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires: ecj >= 1:4.6.1 Requires: ecj >= 1:4.6.1
Requires: apache-commons-collections
Requires: apache-commons-dbcp Requires: apache-commons-dbcp
Requires: apache-commons-pool Requires: apache-commons-pool
Requires(preun): coreutils Requires(preun): coreutils
@ -245,7 +242,6 @@ export OPT_JAR_LIST="xalan-j2-serializer"
# who needs a build.properties file anyway # who needs a build.properties file anyway
%{ant} -Dbase.path="." \ %{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \ -Dbuild.compiler="modern" \
-Dcommons-collections.jar="$(build-classpath apache-commons-collections)" \
-Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \ -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \
-Dcommons-daemon.native.src.tgz="HACK" \ -Dcommons-daemon.native.src.tgz="HACK" \
-Djdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj)" \
@ -365,8 +361,7 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
popd popd
pushd output/build pushd output/build
%{_bindir}/build-jar-repository lib apache-commons-collections \ %{_bindir}/build-jar-repository lib apache-commons-dbcp apache-commons-pool ecj 2>&1
apache-commons-dbcp apache-commons-pool ecj 2>&1
# need to use -p here with b-j-r otherwise the examples webapp fails to # need to use -p here with b-j-r otherwise the examples webapp fails to
# load with a java.io.IOException # load with a java.io.IOException
%{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \ %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
@ -378,7 +373,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
%{__ln_s} ../../java/%{name}-jsp-%{jspspec}-api.jar . %{__ln_s} ../../java/%{name}-jsp-%{jspspec}-api.jar .
%{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar . %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar .
%{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar . %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar .
%{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar
%{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar
%{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar
%{__ln_s} $(build-classpath ecj) jasper-jdt.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar