rpms/tomcat5/devel tomcat5.spec,1.28,1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 20 14:32:12 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8402
Modified Files:
tomcat5.spec
Log Message:
Upgrade to latest JPackage and 90% convert to aot-compile-rpm
Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tomcat5.spec 27 Jun 2005 10:17:23 -0000 1.28
+++ tomcat5.spec 20 Jul 2005 14:31:51 -0000 1.29
@@ -2,7 +2,7 @@
%define full_name jakarta-%{name}
%define version 5.0.30
%define majversion 5.0
-%define release 6jpp_1fc
+%define release 7jpp_0fc
%define section free
%define summary Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -123,10 +123,9 @@
# RHEL3 and FC2
Obsoletes: tomcat tomcat-libs tomcat-devel tomcat-test
# libgcj aot-compiled native libraries
-BuildRequires: gcc-java >= 4.0.0-0.43
-BuildRequires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
-ExclusiveArch: %{ix86} x86_64 ppc alpha
+BuildRequires: java-gcj-compat-devel >= 1.0.31
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
%description
Server that conforms to the Servlet 2.4 and JSP 2.0
@@ -144,7 +143,8 @@
Provides: servletapi5
Summary: Java servlet and JSP API classes
# libgcj aot-compiled native libraries
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
%description servlet-2.4-api
This subproject contains the source code for the implementation classes
@@ -172,7 +172,8 @@
Provides: jasper5
Summary: Apache JSP Engine, RI for Servlet JSP 2.0 API
# libgcj aot-compiled native libraries
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_16rh
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
%description jasper
JSP engine that conforms to the JSP 2.0
@@ -344,59 +345,6 @@
ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
popd
-# BC-compile everything
-pushd %{packdname}
-mkdir dist
-gcj-dbtool -n dist/%{name}-%{version}.db 2048
-for jar in jakarta-tomcat-5/dist/bin/bootstrap.jar \
- jakarta-tomcat-5/dist/common/lib/naming-*.jar \
- jakarta-tomcat-5/dist/server/lib/{catalina,tomcat,servlets}*.jar; do
- base=`basename $jar .jar`
- opts="$RPM_OPT_FLAGS -fPIC"
- case $base in
- catalina-ant)
- continue
- ;;
- catalina|catalina-optional)
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21362
- opts=`echo "$opts" | sed "s:-O.:-O0:"`
- ;;
- bootstrap)
- base=tomcat-$base
- ;;
- esac
- lib=dist/lib$base-%{version}.jar.so
-
- aot-compile $jar $lib "$opts"
- gcj-dbtool -f \
- dist/%{name}-%{version}.db \
- $jar \
- %{_libdir}/`basename $lib`
-done
-
-gcj-dbtool -n dist/%{name}-jasper-%{version}.db 512
-for jar in jakarta-tomcat-5/dist/common/lib/jasper-*.jar; do
- base=`basename $jar .jar`
- lib=dist/lib`echo $base | sed "s:jasper:jasper5:"`-%{version}.jar.so
- aot-compile $jar $lib "$RPM_OPT_FLAGS -fPIC"
- gcj-dbtool -f \
- dist/%{name}-jasper-%{version}.db \
- $jar \
- %{_libdir}/`basename $lib`
-done
-
-gcj-dbtool -n dist/%{name}-servlet-2.4-api-%{version}.db 256
-for jar in jakarta-servletapi-5/jsr15[24]/dist/lib/*.jar; do
- base=`basename $jar .jar`
- lib=dist/lib`echo $base | \
- sed "s:-::; s:servletapi:servletapi5:"`-%{version}.jar.so
- aot-compile $jar $lib "$RPM_OPT_FLAGS -fPIC"
- gcj-dbtool -f \
- dist/%{name}-servlet-2.4-api-%{version}.db \
- $jar \
- %{_libdir}/`basename $lib`
-done
-popd
%install
rm -rf $RPM_BUILD_ROOT
@@ -584,14 +532,6 @@
ln -s %{name}-jasper-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper
popd
-# solibs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-install -m 755 %{packdname}/dist/lib*.jar.so $RPM_BUILD_ROOT%{_libdir}
-
-# gcjdb
-gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
-install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
-install -m 644 %{packdname}/dist/*.db $RPM_BUILD_ROOT$gcjdbdir
%clean
@@ -635,27 +575,27 @@
build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
xml-commons-apis 2>&1
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%post jasper
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%postun jasper
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%post servlet-2.4-api
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%postun servlet-2.4-api
-/usr/bin/rebuild-gcj-db %{_libdir}
+%{_bindir}/rebuild-gcj-db
%post servlet-2.4-api-javadoc
@@ -812,19 +752,19 @@
%{serverdir}/lib/*
# %{tempdir}/README.txt
-%attr(0755,root,root) %{_libdir}/libnaming*.jar.so
-%attr(0755,root,root) %{_libdir}/libcatalina*.jar.so
-%attr(0755,root,root) %{_libdir}/libtomcat*.jar.so
-%attr(0755,root,root) %{_libdir}/libservlets*.jar.so
-%{_libdir}/*/*/%{name}-%{version}.db
+#%attr(0755,root,root) %{_libdir}/libnaming*.jar.so
+#%attr(0755,root,root) %{_libdir}/libcatalina*.jar.so
+#%attr(0755,root,root) %{_libdir}/libtomcat*.jar.so
+#%attr(0755,root,root) %{_libdir}/libservlets*.jar.so
+#%{_libdir}/*/*/%{name}-%{version}.db
%files servlet-2.4-api
%defattr(-,root,root)
%doc %{packdname}/jakarta-tomcat-5/LICENSE
%{_javadir}/servletapi5*.jar
%{_javadir}/jspapi*.jar
-%attr(0755,root,root) %{_libdir}/lib*api*.jar.so
-%{_libdir}/*/*/%{name}-servlet-2.4-api-%{version}.db
+#%attr(0755,root,root) %{_libdir}/lib*api*.jar.so
+#%{_libdir}/*/*/%{name}-servlet-2.4-api-%{version}.db
%files servlet-2.4-api-javadoc
%defattr(-,root,root)
@@ -840,8 +780,8 @@
%doc %{packdname}/jakarta-tomcat-jasper/jasper2/doc/*
%{_javadir}/jasper*.jar
%{_bindir}/j*
-%attr(0755,root,root) %{_libdir}/libjasper*.jar.so
-%{_libdir}/*/*/%{name}-jasper-%{version}.db
+#%attr(0755,root,root) %{_libdir}/libjasper*.jar.so
+#%{_libdir}/*/*/%{name}-jasper-%{version}.db
%files jasper-javadoc
%defattr(-,root,root)
@@ -873,6 +813,22 @@
%{serverdir}/webapps/*
%changelog
+* Wed Jul 20 2005 Gary Benson <gbenson at redhat.com>
+- Build on ia64, ppc64, s390 and s390x.
+- Switch to aot-compile-rpm.
+
+* Wed Jul 20 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-7jpp
+- Remove references to the never used commons-daemon.
+- Remove an unused patch and a couple of comments.
+- Add a runtime dependency on puretls.
+- Build webapps in build not install.
+- Correct ant-launcher path in first set of build.properties.
+- Explicitly specify which mx4j jars to use at all times.
+- Don't include jars from other rpms in %{bindir}.
+- Correct permissions and remove junk from %{bindir}.
+- Add ant-launcher.jar to common classloader.
+- s/tomcat4/tomcat5/ in various comments.
+
* Tue May 31 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-6jpp_1fc
- Rearrange how BC-compiled stuff is built and installed.
More information about the fedora-cvs-commits
mailing list