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

Moved build-jar-repository to later in the install process

Browse Source
This commit is contained in:
Dave Knox 2010-04-08 23:50:29 +00:00
parent 41fbc279fe
commit fa747cfad5
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tomcat6.spec
View File

@ -54,7 +54,7 @@
Name: tomcat6 Name: tomcat6
Epoch: 0 Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version} Version: %{major_version}.%{minor_version}.%{micro_version}
Release: 3%{?dist} Release: 4%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons Group: Networking/Daemons
@ -263,12 +263,6 @@ zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
# move things into place # move things into place
# First copy supporting libs to tomcat lib # First copy supporting libs to tomcat lib
pushd %{packdname}/output/build pushd %{packdname}/output/build
%{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
# need to use -p here with b-j-r otherwise the examples webapp fails to
# load with a java.io.IOException
%{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
taglibs-core.jar taglibs-standard.jar 2>&1
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
%{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
%{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir} %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
@ -311,6 +305,16 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
%{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \ %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \
%{name}-servlet-%{servletspec}-api.jar %{name}-servlet-%{servletspec}-api.jar
popd popd
pushd %{packdname}/output/build
%{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
# need to use -p here with b-j-r otherwise the examples webapp fails to
# load with a java.io.IOException
%{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
taglibs-core.jar taglibs-standard.jar 2>&1
popd
pushd ${RPM_BUILD_ROOT}%{libdir} pushd ${RPM_BUILD_ROOT}%{libdir}
# fix up jars to include version number # fix up jars to include version number
for i in *.jar; do for i in *.jar; do
@ -518,6 +522,9 @@ fi
%{appdir}/sample %{appdir}/sample
%changelog %changelog
* Tue Apr 08 2010 David Knox <dknox@redhat.com> 0:6.0.26-4
- Moved build-jar-repository to later in the install process.
* Tue Apr 06 2010 David Knox <dknox@redhat.com> 0:6.0.26-3 * Tue Apr 06 2010 David Knox <dknox@redhat.com> 0:6.0.26-3
- Incremented the Release tag to 3 to avoid any confusion about which - Incremented the Release tag to 3 to avoid any confusion about which
- is the most recent - is the most recent