[tomcat5] - New version 5.5.31. - Fix FTBFS - build system has changed a lot upstream. - Drop gcj_support.
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Oct 21 11:16:15 UTC 2010
commit e18fd3f7846c4f08f1375b6527f04bd6eab721fb
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu Oct 21 14:15:24 2010 +0300
- New version 5.5.31.
- Fix FTBFS - build system has changed a lot upstream.
- Drop gcj_support.
.gitignore | 2 +
sources | 4 +-
tomcat5.spec | 193 ++++++++++-----------------------------------------------
3 files changed, 38 insertions(+), 161 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a813caf..eb5cd08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
tomcat5-poms-5.5.27.tar.bz2
apache-tomcat-5.5.29-src.tar.gz
+tomcat5-poms-5.5.31.tar.bz2
+apache-tomcat-5.5.31-src.tar.gz
diff --git a/sources b/sources
index ab61de8..15b9d83 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c110d4d1a33321eec645f2e58214f25a tomcat5-poms-5.5.27.tar.bz2
-2e661301c211b0860389ea2e37c8c6af apache-tomcat-5.5.29-src.tar.gz
+c27a9197ef1029544f1578b9cd06062c tomcat5-poms-5.5.31.tar.bz2
+6005b9eb057619654cab1fd32bdba186 apache-tomcat-5.5.31-src.tar.gz
diff --git a/tomcat5.spec b/tomcat5.spec
index 2041b22..a3a1644 100644
--- a/tomcat5.spec
+++ b/tomcat5.spec
@@ -28,10 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define section free
-
-%define gcj_support 0
-
# If you want only apis to be built,
# give rpmbuild option '--with apisonly'
%define with_apisonly %{?_with_apisonly:1}%{!?_with_apisonly:0}
@@ -45,7 +41,7 @@
%define full_jname jasper5
%define jname jasper
%define majversion 5.5
-%define minversion 29
+%define minversion 31
%define servletspec 2.4
%define jspspec 2.0
@@ -83,7 +79,7 @@ Source2: %{name}-%{majversion}.conf
Source3: %{name}-%{majversion}.wrapper
Source4: %{name}-%{majversion}.logrotate
Source5: %{name}-%{majversion}.relink
-Source6: %{name}-poms-5.5.27.tar.bz2
+Source6: %{name}-poms-%{version}.tar.bz2
#Source6: %{name}-poms-%{version}.tar.bz2
Source7: jasper-OSGi-MANIFEST.MF
Source8: servlet-api-OSGi-MANIFEST.MF
@@ -109,22 +105,19 @@ Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
# Seems to be only needed when building with ECJ for java 1.5 since
# the default source type for ecj is still 1.4
Patch19: %{name}-%{majversion}-connectors-util-build.patch
-# Temp patch which will be removed as of 5.5.30:
-Patch90: %{name}-%{majversion}-cve-2010-1157.patch
+Patch20: %{name}-%{majversion}-nonative.patch
BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
-Buildrequires: jpackage-utils >= 0:1.7.4
+BuildRequires: jpackage-utils >= 0:1.7.4
BuildRequires: java-1.6.0-devel
BuildRequires: ant >= 0:1.6.5
%if %{without_apisonly}
%if %{with_ecj}
BuildRequires: ecj >= 0:3.3.1.1
%endif
-BuildRequires: ant-trax
+BuildRequires: ant-nodeps
BuildRequires: xalan-j2
BuildRequires: jakarta-commons-beanutils >= 0:1.7
BuildRequires: jakarta-commons-collections >= 0:3.1
@@ -151,15 +144,11 @@ BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
# formerly non-free stuff
# jta can be provided by geronimo-jta-version-api
BuildRequires: jta
-# jaf can be provided by classpathx-jaf
-BuildRequires: jaf
# javamail can be provided by classpathx-mail
BuildRequires: javamail
+BuildRequires: mx4j
Requires(post): xml-commons-jaxp-1.3-apis
# libgcj aot-compiled native libraries
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-%endif
Requires(post): jpackage-utils >= 0:1.7.4
Requires(post): /bin/rm
Requires(preun): /bin/rm
@@ -174,8 +163,6 @@ Requires(pre): %{_sbindir}/groupadd
Requires(post): jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1
Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2
-Requires: jaf = 0:1.0.2
-Requires(post): jaf = 0:1.0.2
Requires: jakarta-commons-logging >= 0:1.0.4
Requires(post): jakarta-commons-logging >= 0:1.0.4
Requires: javamail = 0:1.3.1
@@ -397,13 +384,13 @@ jasper-runtime and ECJ.
cd %{packdname}
%patch0 -p0
%patch1 -p0
-%patch2 -p0
+#%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch7 -p0
%patch8 -p0
-%patch9 -p0
+#%patch9 -p0
%patch10 -p0
%patch12 -p0
%patch13 -p0
@@ -415,25 +402,26 @@ cd %{packdname}
%patch18 -p0
%endif
%if %{with_ecj}
-%patch19 -p0
+%patch19 -p0
%endif
-%patch90 -p0
+%patch20 -b .sav
%if %{without_ecj}
%{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
%endif
#find -type f -name '*.jsp' | xargs -t perl -pi -e 's/<html:html locale="true">/<html:html>/g'
+mkdir commons-launcher
+pushd commons-launcher
+jar xf /usr/share/java/apache-commons-launcher.jar
+cp LauncherBootstrap.class ../..
+popd
%build
# remove pre-built binaries
for dir in ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} ; do
find $dir \( -name "*.jar" -o -name "*.class" \) | xargs -t %{__rm} -f
done
-# copy license for later doc files declaration
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}
- %{__cp} -p build/LICENSE .
-popd
# build jspapi and servletapi as ant dist will require them later
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
pushd jsr154
@@ -476,7 +464,7 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build
version=%{version}
version.build=%{minversion}
ant.jar=%{_javadir}/ant.jar
-ant-launcher.jar=%{_javadir}/ant.jar
+ant-launcher.jar=%{_javadir}/ant-launcher.jar
jtc.home=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors/
%{jname}.home=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}
commons-beanutils.jar=$(build-classpath commons-beanutils)
@@ -488,6 +476,7 @@ commons-el.jar=$(build-classpath commons-el)
commons-fileupload.jar=$(build-classpath commons-fileupload)
commons-io.jar=$(build-classpath commons-io)
commons-launcher.jar=$(build-classpath commons-launcher)
+commons-launcher.bootstrap.class=${RPM_BUILD_DIR}/%{name}-%{version}/LauncherBootstrap.class
commons-logging.jar=$(build-classpath commons-logging)
commons-logging-api.jar=$(build-classpath commons-logging-api)
commons-modeler.jar=$(build-classpath commons-modeler)
@@ -507,8 +496,7 @@ xercesImpl.jar=$(build-classpath jaxp_parser_impl)
xml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis)
struts.jar=$(build-classpath struts)
struts.lib=%{_datadir}/struts
-activation.jar=$(build-classpath jaf)
-mail.jar=$(build-classpath javamail)
+mail.jar=$(build-classpath javamail/mail)
jta.jar=$(build-classpath jta)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
@@ -522,14 +510,13 @@ EOBP
ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" init
cp ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar \
${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build/build/common/lib/servlet-api.jar
- ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
+ ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" -Djdk1.4.present=true -Dtomcat-dbcp.jar=$(build-classpath commons-dbcp) build
popd
# build the connectors
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors
# use the JARs created above to build
- export CLASSPATH="${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/jakarta-tomcat-5/build/server/lib/catalina.jar"
+ export CLASSPATH="${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build/build/server/lib/tomcat-util.jar"
%{__cat} > build.properties << EOBP
-activation.jar=$(build-classpath jaf)
ant.jar=%{_javadir}/ant.jar
junit.jar=$(build-classpath junit)
commons-beanutils.jar=$(build-classpath commons-beanutils)
@@ -538,14 +525,14 @@ commons-daemon.jar=$(build-classpath commons-daemon)
commons-digester.jar=$(build-classpath commons-digester)
commons-fileupload.jar=$(build-classpath commons-fileupload)
commons-io.jar=$(build-classpath commons-io)
+commons-launcher.jar=$(build-classpath commons-launcher)
commons-logging.jar=$(build-classpath commons-logging)
commons-logging-api.jar=$(build-classpath commons-logging-api)
commons-modeler.jar=$(build-classpath commons-modeler)
commons-pool.jar=$(build-classpath commons-pool)
regexp.jar=$(build-classpath regexp)
jmx.jar=$(build-classpath mx4j/mx4j-jmx)
-activation.jar=$(build-classpath jaf)
-mail.jar=$(build-classpath javamail)
+mail.jar=$(build-classpath javamail/mail)
jta.jar=$(build-classpath jta)
jaas.jar=$(build-classpath jaas)
jndi.jar=$(build-classpath jndi)
@@ -643,8 +630,8 @@ EOT
%{__rm} -f %{name}.conf
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build
export usejikes="false"
- export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer"
- ant -Dbuild.compiler="modern" -Djava.home=%{java_home} dist
+ export OPT_JAR_LIST="ant/ant-nodeps xalan-j2-serializer"
+ ant -Dbuild.compiler="modern" -Djava.home=%{java_home} -Djasper-compiler-jdt.jar=%{_javadir}/ecj.jar -Dtomcat-dbcp.jar=$(build-classpath commons-dbcp) dist
pushd dist
%{__mv} bin/* ${RPM_BUILD_ROOT}%{bindir}
%{__mv} common/* ${RPM_BUILD_ROOT}%{commondir}
@@ -653,10 +640,6 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build
%{__mv} shared/* ${RPM_BUILD_ROOT}%{shareddir}
%{__mv} webapps/* ${RPM_BUILD_ROOT}%{appdir}
popd
- pushd build/conf
- %{__mv} uriworkermap.properties workers.properties \
- workers.properties.minimal ${RPM_BUILD_ROOT}%{confdir}
- popd
popd
# rename catalina.sh into dtomcat5 to let wrapper take precedence
%{__install} ${RPM_BUILD_ROOT}%{bindir}/catalina.sh \
@@ -953,17 +936,6 @@ popd
%endif
%endif
-%if %{gcj_support}
-# Remove non-standard jars from the list for aot compilation
-%{_bindir}/aot-compile-rpm \
- --exclude var/lib/%{name}/webapps/tomcat-docs/appdev/sample/sample.war \
- --exclude var/lib/%{name}/webapps/servlets-examples/WEB-INF/classes \
- --exclude var/lib/%{name}/webapps/jsp-examples/WEB-INF/classes \
- --exclude var/lib/%{name}/webapps/jsp-examples/plugin/applet \
- --exclude var/lib/%{name}/server/lib/servlets-cgi.renametojar \
- --exclude var/lib/%{name}/server/lib/servlets-ssi.renametojar
-%endif
-
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -996,7 +968,7 @@ done
build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
xml-commons-jaxp-1.3-apis 2>&1
build-jar-repository %{commondir}/lib commons-collections-tomcat5 \
- commons-dbcp-tomcat5 commons-el commons-pool-tomcat5 jaf javamail jsp \
+ commons-dbcp-tomcat5 commons-el commons-pool-tomcat5 javamail/mail jsp \
%{name}/naming-factory %{name}/naming-resources servlet \
%{jname}5-compiler %{jname}5-runtime 2>&1
%if %{with_ecj}
@@ -1008,49 +980,15 @@ build-jar-repository %{serverdir}/lib catalina-ant5 commons-modeler \
%{name}/servlets-default %{name}/servlets-invoker %{name}/servlets-webdav \
%{name}/tomcat-ajp %{name}/tomcat-apr %{name}/tomcat-coyote \
%{name}/tomcat-http %{name}/tomcat-jkstatus-ant %{name}/tomcat-util 2>&1
-%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%postun
%update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
-
-%if %{gcj_support}
-%post common-lib
-if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
-
-%if %{gcj_support}
-%postun common-lib
-if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
-
-%if %{gcj_support}
-%post server-lib
-if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
-
-%if %{gcj_support}
-%postun server-lib
-if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%post webapps
# Create automated links - since all needed extensions may not have been
# installed for this jvm output is muted
build-jar-repository %{appdir}/jsp-examples/WEB-INF/lib \
jakarta-taglibs-core jakarta-taglibs-standard 2>&1
-%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
-
-%if %{gcj_support}
-%postun webapps
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%post admin-webapps
# Remove old automated symlinks
@@ -1065,14 +1003,7 @@ 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
-%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
-%if %{gcj_support}
-%postun admin-webapps
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%endif
%post servlet-%{servletspec}-api
@@ -1080,9 +1011,6 @@ build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
%{_sbindir}/update-alternatives --install %{_javadir}/servlet_2_4_api.jar servlet_2_4_api \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
-%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%post servlet-%{servletspec}-api-javadoc
%{__rm} -f %{_javadocdir}/servletapi # legacy symlink
@@ -1094,18 +1022,12 @@ if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove servlet_2_4_api \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
fi
-%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%post jsp-%{jspspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
%{_sbindir}/update-alternatives --install %{_javadir}/jsp_2_0_api.jar jsp_2_0_api \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
-%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%post jsp-%{jspspec}-api-javadoc
%{__rm} -f %{_javadocdir}/jsp-api # legacy symlink
@@ -1117,9 +1039,6 @@ if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove jsp_2_0_api \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
fi
-%if %{gcj_support}
- if [ -x %{_bindir}/rebuild-gcj-db ]; then %{_bindir}/rebuild-gcj-db || true ; fi
-%endif
%if %{without_apisonly}
%preun
@@ -1164,7 +1083,8 @@ fi
%if %{without_apisonly}
%files
%defattr(0644,root,root,0755)
-%doc %{packdname}/build/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt}
+%doc %{packdname}/LICENSE
+%doc %{packdname}/build/{RELE*,RUNNING.txt,BENCHMARKS.txt}
# symlinks
%{_datadir}/%{name}/common
%{_datadir}/%{name}/temp
@@ -1213,22 +1133,11 @@ fi
%config(noreplace) %{confdir}/server.xml
%config(noreplace) %{confdir}/web.xml
%config(noreplace) %{confdir}/context.xml
-%config(noreplace) %{confdir}/uriworkermap.properties
-%config(noreplace) %{confdir}/workers.properties
-%config(noreplace) %{confdir}/workers.properties.minimal
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{commondir}/i18n/*
%{_mavendepmapfragdir}/*
%{_datadir}/maven2/poms/JPP.tomcat5-parent.pom
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
-#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
-#%%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
-#%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*
-%endif
%files common-lib
%defattr(0644,root,root,0755)
@@ -1236,9 +1145,6 @@ fi
%{_javadir}/%{name}/naming*.jar
%{_datadir}/maven2/poms/JPP.tomcat5-naming-factory.pom
%{_datadir}/maven2/poms/JPP.tomcat5-naming-resources.pom
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/naming-*
-%endif
%files server-lib
%defattr(0644,root,root,0755)
@@ -1266,24 +1172,8 @@ fi
%{_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-jkstatus-ant.pom
%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-juli.pom
%{_datadir}/maven2/poms/JPP.tomcat5-tomcat-util.pom
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-optional*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-storeconfig*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-%{version}.jar*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-default*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-invoker*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-webdav*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-ajp*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-apr*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-coyote*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-http*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-util*
-%endif
%files webapps
%defattr(0644,root,tomcat,0775)
@@ -1297,11 +1187,6 @@ fi
%{appdir}/tomcat-docs/*
%dir %{appdir}/webdav
%{appdir}/webdav/*
-%if %{gcj_support}
-%ifnarch ppc64 s390x
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root*
-%endif
-%endif
%files admin-webapps
%defattr(0640,root,tomcat,0750)
@@ -1318,12 +1203,6 @@ fi
%{_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
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-admin*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-balancer*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-host-manager*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager*
-%endif
%files %{jname}
%defattr(0644,root,root,0755)
@@ -1333,9 +1212,6 @@ fi
%attr(0755,root,root) %{_bindir}/jspc*.sh
%{_datadir}/maven2/poms/JPP-jasper5-compiler.pom
%{_datadir}/maven2/poms/JPP-jasper5-runtime.pom
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{jname}5-*
-%endif
%files %{jname}-javadoc
%defattr(0644,root,root,0755)
@@ -1345,13 +1221,10 @@ fi
%files servlet-%{servletspec}-api
%defattr(0644,root,root,0755)
-%doc %{packdname}/build/LICENSE
+%doc %{packdname}/LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api*.jar
%{_javadir}/servletapi5.jar
%{_datadir}/maven2/poms/JPP-tomcat5-servlet-2.4-api.pom
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-servlet-%{servletspec}-api*
-%endif
%files servlet-%{servletspec}-api-javadoc
%defattr(0644,root,root,0755)
@@ -1360,13 +1233,10 @@ fi
%files jsp-%{jspspec}-api
%defattr(0644,root,root,0755)
-%doc %{packdname}/build/LICENSE
+%doc %{packdname}/LICENSE
%{_javadir}/%{name}-jsp-%{jspspec}-api*.jar
%{_javadir}/jspapi.jar
%{_datadir}/maven2/poms/JPP-tomcat5-jsp-2.0-api.pom
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsp-%{jspspec}-api*
-%endif
%files jsp-%{jspspec}-api-javadoc
%defattr(0644,root,root,0755)
@@ -1384,6 +1254,11 @@ fi
%endif
%changelog
+* Thu Oct 21 2010 Alexander Kurtakov <akurtako at redhat.com> 0:5.5.31-1
+- New version 5.5.31.
+- Fix FTBFS - build system has changed a lot upstream.
+- Drop gcj_support.
+
* Fri Apr 23 2010 Devrim GUNDUZ <devrim at gunduz.org> 0:5.5.29-1.1
- Update to 5.5.29, add a new patch to fix CVE-2010-1157.
Fixes #585331. This patch will be removed in 5.5.30.
More information about the scm-commits
mailing list