[tomcat5] Fix build without struts which has been orphaned and removed from distro.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Sep 19 10:42:44 UTC 2011
commit 5a416050963309e0f71fe65656f343832c71dafc
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Mon Sep 19 13:41:47 2011 +0300
Fix build without struts which has been orphaned and removed from
distro.
Guidelines fixes.
disable-adminwebapp.patch | 84 +++++++++++++++++++
tomcat5.spec | 196 +++++++++++++++++++++++----------------------
2 files changed, 185 insertions(+), 95 deletions(-)
---
diff --git a/disable-adminwebapp.patch b/disable-adminwebapp.patch
new file mode 100644
index 0000000..592b0f6
--- /dev/null
+++ b/disable-adminwebapp.patch
@@ -0,0 +1,84 @@
+--- build/build.xml.noadmin 2011-09-16 23:27:18.165454850 +0300
++++ build/build.xml 2011-09-16 23:29:55.472149708 +0300
+@@ -494,16 +494,6 @@
+ outputDir="${jsp-examples.base}/WEB-INF/src"
+ javaEncoding="UTF-8" />
+
+- <jasper2
+- package="admin"
+- compile="false"
+- validateXml="false"
+- uriroot="${admin.base}"
+- webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
+- addWebXmlMappings="true"
+- outputDir="${admin.base}/WEB-INF/src/admin"
+- javaEncoding="UTF-8" />
+-
+ <javac destdir="${ROOT.base}/WEB-INF/classes"
+ optimize="off"
+ debug="${compile.debug}"
+@@ -560,30 +550,6 @@
+ <exclude name="tags/**" />
+ </javac>
+
+- <javac destdir="${admin.base}/WEB-INF/classes"
+- optimize="off"
+- debug="${compile.debug}"
+- deprecation="${compile.deprecation}"
+- source="${compile.source}"
+- failonerror="false"
+- srcdir="${admin.base}/WEB-INF/src"
+- excludes="**/*.smap"
+- encoding="UTF-8">
+- <classpath>
+- <pathelement location="${java.home}/../lib/tools.jar"/>
+- <fileset dir="${tomcat.build}/server/lib">
+- <include name="*.jar"/>
+- </fileset>
+- <fileset dir="${admin.base}/WEB-INF/lib">
+- <include name="*.jar"/>
+- </fileset>
+- <fileset dir="${tomcat.build}/common/lib">
+- <include name="*.jar"/>
+- </fileset>
+- <pathelement location="${tomcat.build}/classes"/>
+- </classpath>
+- <include name="admin/**" />
+- </javac>
+ </target>
+
+ <target name="build-catalina" depends="init"
+@@ -852,8 +818,6 @@
+ <property name="flags.hide" value="true" />
+ </ant>
+
+- <antcall target="build-admin" />
+-
+ <ant dir="${catalina.home}/webapps/manager" target="build-main">
+ <property name="webapps.build" value="${tomcat.build}/server/webapps" />
+ <property name="classes.dir" value="${tomcat.build}/classes" />
+@@ -906,13 +870,6 @@
+ filtering="true" encoding="ISO-8859-1" />
+
+ <!-- Build JARs for webapps classes -->
+- <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
+- <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar">
+- <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
+- <include name="**/*.class" />
+- <include name="**/*.properties" />
+- </fileset>
+- </jar>
+ <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
+ <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar">
+ <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes">
+@@ -947,9 +904,7 @@
+ todir="${tomcat.build}/conf/Catalina/localhost" />
+ <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
+ todir="${tomcat.build}/conf/Catalina/localhost" />
+- <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
+- todir="${tomcat.build}/conf/Catalina/localhost" />
+-
++
+ </target>
+
+ <!-- ====================== Embed target =================== -->
diff --git a/tomcat5.spec b/tomcat5.spec
index e77fd69..de08edf 100644
--- a/tomcat5.spec
+++ b/tomcat5.spec
@@ -33,6 +33,9 @@
%define with_apisonly %{?_with_apisonly:1}%{!?_with_apisonly:0}
%define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0}
+%define with_adminapps %{?_with_adminapps:1}%{!?_with_adminapps:0}
+%define without_adminapps %{!?_with_adminapps:1}%{?_with_adminapps:0}
+
# If you don't want direct ecj support to be built in,
# while ecj isn't available, give rpmbuild option '--without ecj'
%define without_ecj %{?_without_ecj:1}%{!?_without_ecj:0}
@@ -67,7 +70,7 @@
Name: tomcat5
Epoch: 0
Version: %{majversion}.%{minversion}
-Release: 3%{dist}
+Release: 4%{dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Group: Networking/Daemons
@@ -107,34 +110,32 @@ Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
Patch19: %{name}-%{majversion}-connectors-util-build.patch
Patch20: %{name}-%{majversion}-nonative.patch
-BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
+Patch21: disable-adminwebapp.patch
+
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.4
-BuildRequires: java-1.6.0-devel
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5
%if %{without_apisonly}
%if %{with_ecj}
BuildRequires: ecj >= 0:3.3.1.1
%endif
-BuildRequires: ant-nodeps
BuildRequires: xalan-j2
-BuildRequires: jakarta-commons-beanutils >= 0:1.7
-BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-daemon >= 0:1.0.1
-BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
-BuildRequires: jakarta-commons-digester >= 0:1.7
-BuildRequires: jakarta-commons-logging >= 0:1.0.4
-BuildRequires: jakarta-commons-fileupload >= 0:1.0
-BuildRequires: jakarta-commons-io >= 0:1.3
-BuildRequires: jakarta-commons-modeler >= 0:2.0
-BuildRequires: jakarta-commons-pool >= 0:1.2
-BuildRequires: jakarta-commons-launcher >= 0:0.9
-BuildRequires: jakarta-commons-el >= 0:1.0
+BuildRequires: apache-commons-beanutils >= 0:1.7
+BuildRequires: apache-commons-collections >= 0:3.1
+BuildRequires: apache-commons-daemon >= 0:1.0.1
+BuildRequires: apache-commons-dbcp >= 0:1.2.1
+BuildRequires: apache-commons-digester >= 0:1.7
+BuildRequires: apache-commons-logging >= 0:1.0.4
+BuildRequires: apache-commons-fileupload >= 0:1.0
+BuildRequires: apache-commons-io >= 0:1.3
+BuildRequires: apache-commons-modeler >= 0:2.0
+BuildRequires: apache-commons-pool >= 0:1.2
+BuildRequires: apache-commons-launcher >= 0:0.9
+BuildRequires: apache-commons-el >= 0:1.0
BuildRequires: junit >= 0:3.8.1
BuildRequires: regexp >= 0:1.3
-BuildRequires: struts >= 0:1.2.9
-#BuildRequires: struts-taglib >= 0:1.3.8
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: zip
# xml-commons-apis is needed by Xerces-J2
@@ -159,11 +160,11 @@ Requires(preun): redhat-lsb
Requires(post): findutils
Requires(preun): findutils
Requires(pre): shadow-utils
-Requires(post): jakarta-commons-dbcp >= 0:1.2.1
-Requires(post): jakarta-commons-collections >= 0:3.1
-Requires(post): jakarta-commons-pool >= 0:1.2
-Requires: jakarta-commons-logging >= 0:1.0.4
-Requires(post): jakarta-commons-logging >= 0:1.0.4
+Requires(post): apache-commons-dbcp >= 0:1.2.1
+Requires(post): apache-commons-collections >= 0:3.1
+Requires(post): apache-commons-pool >= 0:1.2
+Requires: apache-commons-logging >= 0:1.0.4
+Requires(post): apache-commons-logging >= 0:1.0.4
Requires: javamail
Requires(post): javamail
%if %{with_ecj}
@@ -176,9 +177,9 @@ Requires: jpackage-utils >= 0:1.7.4
Requires: xerces-j2 >= 0:2.7.1
Requires: xml-commons-jaxp-1.3-apis
# jakarta-commons packages
-Requires: jakarta-commons-daemon >= 0:1.0.1
-Requires(post): jakarta-commons-daemon >= 0:1.0.1
-Requires: jakarta-commons-launcher >= 0:0.9
+Requires: apache-commons-daemon >= 0:1.0.1
+Requires(post): apache-commons-daemon >= 0:1.0.1
+Requires: apache-commons-launcher >= 0:0.9
# alternatives
Requires: java-1.6.0-devel
# And it needs its own API subpackages for running
@@ -220,17 +221,18 @@ Group: System Environment/Applications
Summary: Administrative web applications for Apache Tomcat
Requires(pre): %{name} = %{epoch}:%{version}-%{release}
Requires(postun): %{name} = %{epoch}:%{version}-%{release}
+%if %{with_adminapps}
Requires: struts >= 0:1.2.9
-#Requires: struts-taglib >= 0:1.3.8
+BuildRequires: struts
+Requires(post): struts
+%endif
Requires(post): /bin/rm
Requires(post): jpackage-utils >= 0:1.7.4
Requires(post): findutils
-Requires(post): jakarta-commons-beanutils
-Requires(post): jakarta-commons-collections
-Requires(post): jakarta-commons-digester
-Requires(post): jakarta-commons-io
-Requires(post): struts
-#Requires(post): struts-taglib
+Requires(post): apache-commons-beanutils
+Requires(post): apache-commons-collections
+Requires(post): apache-commons-digester
+Requires(post): apache-commons-io
Requires(preun): findutils
Requires(preun): coreutils
@@ -296,15 +298,15 @@ Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
Requires: java-1.6.0
Requires(post): jpackage-utils >= 0:1.7.4
-Requires: jakarta-commons-collections >= 0:3.1
-Requires(post): jakarta-commons-collections >= 0:3.1
-Requires: jakarta-commons-dbcp >= 0:1.2.1
-Requires(post): jakarta-commons-dbcp >= 0:1.2.1
-Requires: jakarta-commons-el >= 0:1.0
-Requires(post): jakarta-commons-el >= 0:1.0
+Requires: apache-commons-collections >= 0:3.1
+Requires(post): apache-commons-collections >= 0:3.1
+Requires: apache-commons-dbcp >= 0:1.2.1
+Requires(post): apache-commons-dbcp >= 0:1.2.1
+Requires: apache-commons-el >= 0:1.0
+Requires(post): apache-commons-el >= 0:1.0
# FIXME commons-pool is not listed in the Tomcat build.properties.default
-Requires: jakarta-commons-pool >= 0:1.2
-Requires(post): jakarta-commons-pool >= 0:1.2
+Requires: apache-commons-pool >= 0:1.2
+Requires(post): apache-commons-pool >= 0:1.2
%if %{with_ecj}
Requires: ecj >= 0:3.3.1.1
Requires(post): ecj >= 0:3.3.1.1
@@ -328,8 +330,7 @@ Libraries needed to run the Tomcat Web container (part)
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
Requires(post): jpackage-utils >= 0:1.7.4
-Requires: jakarta-commons-modeler >= 0:2.0
-Requires(post): jakarta-commons-modeler >= 0:2.0
+Requires: apache-commons-modeler >= 0:2.0
# Other subpackages must go in first
Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
@@ -414,6 +415,10 @@ jar xf /usr/share/java/apache-commons-launcher.jar
cp LauncherBootstrap.class ../..
popd
+%if %{without_adminapps}
+%patch21 -b .noadmin
+%endif
+
%build
# remove pre-built binaries
for dir in ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} ; do
@@ -491,8 +496,10 @@ jsp-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/d
servlet.doc=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/docs/api
xercesImpl.jar=$(build-classpath jaxp_parser_impl)
xml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis)
+%if %{with_adminapps}
struts.jar=$(build-classpath struts)
struts.lib=%{_datadir}/struts
+%endif
mail.jar=$(build-classpath javamail/mail)
jta.jar=$(build-classpath jta)
jaas.jar=$(build-classpath jaas)
@@ -571,7 +578,6 @@ zip -u %{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar META-INF/MANIFEST.MF
%endif
%install
-%{__rm} -rf $RPM_BUILD_ROOT
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
%if %{without_apisonly}
export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-taglibs-core jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar"
@@ -584,7 +590,7 @@ export CLASSPATH="$(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis jakarta-t
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_initrddir}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_bindir}
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}/%{name}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
%{__install} -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{bindir}/relink
# SysV init and configuration
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
@@ -675,7 +681,7 @@ done
%add_to_maven_depmap tomcat tomcat-parent %{version} JPP/%{name} parent
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/tomcat-parent-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent.pom
# Process bin
# Remove local JARs (to be replaced with jpp links in post)
pushd ${RPM_BUILD_ROOT}%{bindir}
@@ -688,7 +694,7 @@ pushd ${RPM_BUILD_ROOT}%{bindir}
%add_to_maven_depmap tomcat tomcat-juli %{version} JPP/%{name} tomcat-juli
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/tomcat-juli-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-tomcat-juli.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
find . -name "*.jar" -not -name "*bootstrap*" \
-exec %{__rm} -f {} \;
@@ -708,7 +714,7 @@ pushd ${RPM_BUILD_ROOT}%{serverdir}/lib
%add_to_maven_depmap tomcat catalina-ant %{version} JPP catalina-ant5
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/catalina-ant-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-catalina-ant5.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-catalina-ant5.pom
# catalina* jars will be installed in a public repository
for i in catalina*.jar; do
@@ -721,7 +727,7 @@ pushd ${RPM_BUILD_ROOT}%{serverdir}/lib
%add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.tomcat5-${j}.pom
done
# servlets* jars will be installed in a public repository
for i in servlets-*.jar; do
@@ -734,7 +740,7 @@ pushd ${RPM_BUILD_ROOT}%{serverdir}/lib
%add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.tomcat5-${j}.pom
done
# tomcat* jars will be installed in a public repository
for i in tomcat-*.jar; do
@@ -747,9 +753,10 @@ pushd ${RPM_BUILD_ROOT}%{serverdir}/lib
%add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.tomcat5-${j}.pom
done
popd
+%if %{with_adminapps}
# Process admin webapp server/webapps/admin
pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/admin/WEB-INF/lib
find . -name "*.jar" -not -name 'catalina-admin*' | xargs -t %{__rm} -f
@@ -762,9 +769,10 @@ pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/admin/WEB-INF/lib
%add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.tomcat5-${i}.pom
done
popd
+%endif
# Process manager webapp server/webapps/manager
pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/manager/WEB-INF/lib
find . -name "*.jar" -not -name 'catalina-manager*' | xargs -t %{__rm} -f
@@ -777,7 +785,7 @@ pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/manager/WEB-INF/lib
%add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.tomcat5-${i}.pom
done
popd
# Process host-manager webapp server/webapps/host-manager
@@ -793,7 +801,7 @@ pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/host-manager/WEB-INF/lib
%add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.tomcat5-${i}.pom
done
popd
# Process common/lib
@@ -810,7 +818,7 @@ pushd ${RPM_BUILD_ROOT}%{commondir}/lib
%add_to_maven_depmap tomcat ${i} %{version} JPP ${j}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-${j}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-${j}.pom
done
# naming* jars will be installed in a public repository
for i in naming-*.jar; do
@@ -823,7 +831,7 @@ pushd ${RPM_BUILD_ROOT}%{commondir}/lib
%add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.tomcat5-${j}.pom
done
popd
# Process common/endorsed
@@ -869,10 +877,10 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
%add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP servlet_2_4_api
%add_to_maven_depmap tomcat servlet-api %{version} JPP %{name}-servlet-%{servletspec}-api
%endif
- %{__mkdir} -p $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/ ||:
+ %{__mkdir} -p $RPM_BUILD_ROOT/%{_mavenpomdir}/ ||:
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/servlet-api-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-servlet-%{servletspec}-api.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-servlet-%{servletspec}-api.pom
# javadoc servlet
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
%{__cp} -pr jsr154/build/docs/api/* \
@@ -897,7 +905,7 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
%endif
%{__install} -m 644 \
${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/jsp-api-%{version}.pom \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-jsp-%{jspspec}-api.pom
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-jsp-%{jspspec}-api.pom
# javadoc jsp
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
%{__cp} -pr jsr152/build/docs/api/* \
@@ -933,12 +941,8 @@ popd
%endif
%endif
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
%if %{without_apisonly}
%post
-%update_maven_depmap
# install tomcat5 (but don't activate)
/sbin/chkconfig --add %{name}
# Remove old automated symlinks
@@ -978,9 +982,6 @@ build-jar-repository %{serverdir}/lib catalina-ant5 commons-modeler \
%{name}/tomcat-ajp %{name}/tomcat-apr %{name}/tomcat-coyote \
%{name}/tomcat-http %{name}/tomcat-jkstatus-ant %{name}/tomcat-util 2>&1
-%postun
-%update_maven_depmap
-
%post webapps
# Create automated links - since all needed extensions may not have been
# installed for this jvm output is muted
@@ -1000,7 +1001,6 @@ build-jar-repository %{serverdir}/webapps/host-manager/WEB-INF/lib \
%{name}/catalina-host-manager 2>&1
build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
commons-io commons-fileupload %{name}/catalina-manager 2>&1
-
%endif
%post servlet-%{servletspec}-api
@@ -1056,11 +1056,13 @@ if [ $1 = 0 ]; then
done
fi
+%if %{with_adminapps}
%preun admin-webapps
if [ $1 = 0 ]; then
find %{serverdir}/webapps/*/WEB-INF/lib \
-name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
fi
+%endif
%preun webapps
if [ $1 = 0 ]; then
@@ -1079,7 +1081,6 @@ fi
%if %{without_apisonly}
%files
-%defattr(0644,root,root,0755)
%doc %{packdname}/LICENSE
%doc %{packdname}/build/{RELE*,RUNNING.txt,BENCHMARKS.txt}
# symlinks
@@ -1134,14 +1135,13 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{commondir}/i18n/*
%{_mavendepmapfragdir}/*
-%{_datadir}/maven2/poms/JPP.tomcat5-parent.pom
+%{_mavenpomdir}/JPP.tomcat5-parent.pom
%files common-lib
-%defattr(0644,root,root,0755)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/naming*.jar
-%{_datadir}/maven2/poms/JPP.tomcat5-naming-factory.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-naming-resources.pom
+%{_mavenpomdir}/JPP.tomcat5-naming-factory.pom
+%{_mavenpomdir}/JPP.tomcat5-naming-resources.pom
%files server-lib
%defattr(0644,root,root,0755)
@@ -1156,21 +1156,21 @@ fi
%{_javadir}/%{name}/catalina-storeconfig*.jar
%{_javadir}/%{name}/servlets*.jar
%{_javadir}/%{name}/tomcat*.jar
-%{_datadir}/maven2/poms/JPP-catalina-ant5.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina-ant-jmx.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina-cluster.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina-optional.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina-storeconfig.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-servlets-default.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-servlets-invoker.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-servlets-webdav.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-ajp.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-apr.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-coyote.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-http.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-juli.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-util.pom
+%{_mavenpomdir}/JPP-catalina-ant5.pom
+%{_mavenpomdir}/JPP.tomcat5-catalina-ant-jmx.pom
+%{_mavenpomdir}/JPP.tomcat5-catalina-cluster.pom
+%{_mavenpomdir}/JPP.tomcat5-catalina.pom
+%{_mavenpomdir}/JPP.tomcat5-catalina-optional.pom
+%{_mavenpomdir}/JPP.tomcat5-catalina-storeconfig.pom
+%{_mavenpomdir}/JPP.tomcat5-servlets-default.pom
+%{_mavenpomdir}/JPP.tomcat5-servlets-invoker.pom
+%{_mavenpomdir}/JPP.tomcat5-servlets-webdav.pom
+%{_mavenpomdir}/JPP.tomcat5-tomcat-ajp.pom
+%{_mavenpomdir}/JPP.tomcat5-tomcat-apr.pom
+%{_mavenpomdir}/JPP.tomcat5-tomcat-coyote.pom
+%{_mavenpomdir}/JPP.tomcat5-tomcat-http.pom
+%{_mavenpomdir}/JPP.tomcat5-tomcat-juli.pom
+%{_mavenpomdir}/JPP.tomcat5-tomcat-util.pom
%files webapps
%defattr(0644,root,tomcat,0775)
@@ -1189,17 +1189,19 @@ fi
%defattr(0640,root,tomcat,0750)
%attr(0660,root,tomcat) %{confdir}/Catalina/localhost/manager.xml
%attr(0660,root,tomcat) %{confdir}/Catalina/localhost/host-manager.xml
-%{confdir}/Catalina/localhost/admin.xml
%dir %{appdir}/balancer
%{appdir}/balancer/*
%dir %{serverdir}/webapps
%{serverdir}/webapps/*
+%if %{with_adminapps}
+%{confdir}/Catalina/localhost/admin.xml
%attr(0644,root,root) %{_javadir}/%{name}/catalina-admin*.jar
+%{_mavenpomdir}/JPP.tomcat5-catalina-admin.pom
+%endif
%attr(0644,root,root) %{_javadir}/%{name}/catalina-manager*.jar
%attr(0644,root,root) %{_javadir}/%{name}/catalina-host-manager*.jar
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina-admin.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina-host-manager.pom
-%{_datadir}/maven2/poms/JPP.tomcat5-catalina-manager.pom
+%{_mavenpomdir}/JPP.tomcat5-catalina-host-manager.pom
+%{_mavenpomdir}/JPP.tomcat5-catalina-manager.pom
%files %{jname}
%defattr(0644,root,root,0755)
@@ -1207,8 +1209,8 @@ fi
%{_javadir}/%{jname}5-*.jar
%attr(0755,root,root) %{_bindir}/%{jname}*.sh
%attr(0755,root,root) %{_bindir}/jspc*.sh
-%{_datadir}/maven2/poms/JPP-jasper5-compiler.pom
-%{_datadir}/maven2/poms/JPP-jasper5-runtime.pom
+%{_mavenpomdir}/JPP-jasper5-compiler.pom
+%{_mavenpomdir}/JPP-jasper5-runtime.pom
%files %{jname}-javadoc
%defattr(0644,root,root,0755)
@@ -1221,7 +1223,7 @@ fi
%doc %{packdname}/LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api*.jar
%{_javadir}/servletapi5.jar
-%{_datadir}/maven2/poms/JPP-tomcat5-servlet-2.4-api.pom
+%{_mavenpomdir}/JPP-tomcat5-servlet-2.4-api.pom
%files servlet-%{servletspec}-api-javadoc
%defattr(0644,root,root,0755)
@@ -1233,7 +1235,7 @@ fi
%doc %{packdname}/LICENSE
%{_javadir}/%{name}-jsp-%{jspspec}-api*.jar
%{_javadir}/jspapi.jar
-%{_datadir}/maven2/poms/JPP-tomcat5-jsp-2.0-api.pom
+%{_mavenpomdir}/JPP-tomcat5-jsp-2.0-api.pom
%files jsp-%{jspspec}-api-javadoc
%defattr(0644,root,root,0755)
@@ -1251,6 +1253,10 @@ fi
%endif
%changelog
+* Mon Sep 19 2011 Alexander Kurtakov <akurtako at redhat.com> 0:5.5.31-4
+- Fix build without struts which has been orphaned and removed from distro.
+- Guidelines fixes.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:5.5.31-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list