rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.26, 1.27 java-1.4.2-gcj-compat.spec, 1.86, 1.87 sources, 1.30, 1.31

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29778

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
Bootstrap servletapi5


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	14 Jul 2005 16:40:20 -0000	1.26
+++ .cvsignore	19 Jul 2005 11:39:54 -0000	1.27
@@ -1,3 +1,5 @@
 java-gcj-compat-1.0.33.tar.gz
 bcprov-jdk14-127.tar.gz
 eclipse-ecj-3.1.0_fc-2.jar
+tomcat5-servletapi-5.0.30-6jpp_1fc.jar
+tomcat5-jspapi-5.0.30-6jpp_1fc.jar


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- java-1.4.2-gcj-compat.spec	15 Jul 2005 14:09:40 -0000	1.86
+++ java-1.4.2-gcj-compat.spec	19 Jul 2005 11:39:54 -0000	1.87
@@ -20,7 +20,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_38rh
+%define release		40jpp_39rh
 %define cname           java-%{javaver}-%{origin}
 #%define bcarchivever	127
 
@@ -45,6 +45,8 @@
 #Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
 Source2:	eclipse-ecj-3.1.0_fc-2.jar
 Source3:	ecj.sh.in
+Source4:	tomcat5-servletapi-5.0.30-6jpp_1fc.jar
+Source5:	tomcat5-jspapi-5.0.30-6jpp_1fc.jar
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
@@ -67,6 +69,13 @@
 Provides:	jaxp_parser_impl
 Provides:	jndi, jdbc-stdext, jaas, jsse, jta
 Provides:	java-gcj-compat = %{jgcver}
+%if %{bootstrap}
+Provides:      	servlet
+Provides:      	servlet5
+Provides:      	servlet24
+Obsoletes:     	servletapi5
+Provides:      	servletapi5
+%endif
 Obsoletes:	java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh
 
 %description
@@ -212,6 +221,8 @@
 %if %{bootstrap}
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 install -m644 eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}
+install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_javadir}/servletapi5.jar
+install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_javadir}/jspapi.jar
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
 install -m755 eclipse-ecj.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
 install -m644 eclipse-ecj.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
@@ -425,6 +436,9 @@
 %{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
 # %{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
 # %{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+%if %{bootstrap}
+%{_javadir}/*api*.jar
+%endif
 
 %files devel -f %{name}-%{version}-sdk-bin.files
 %defattr(-,root,root)
@@ -445,6 +459,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Tue Jul 19 2005 Gary Benson <gbenson redhat com> 0:1.4.2.0-40jpp_39rh
+- Provide servletapi and jspapi for bootstrapping.
+
 * Thu Jul 14 2005 Gary Benson <gbenson redhat com> 0:1.4.2.0-40jpp_38rh
 - Import java-gcj-compat 1.0.33.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	14 Jul 2005 16:51:21 -0000	1.30
+++ sources	19 Jul 2005 11:39:54 -0000	1.31
@@ -1,3 +1,5 @@
 012873c27260af4389f07a3bd6ad7200  java-gcj-compat-1.0.33.tar.gz
 d17b7fa532fc87fdf14d42c2d293ec3f  bcprov-jdk14-127.tar.gz
 45cac8feb5fb2cabbde9c7bc73d658f9  eclipse-ecj-3.1.0_fc-2.jar
+8e0b72c63b46369e168805afcfd10018  tomcat5-servletapi-5.0.30-6jpp_1fc.jar
+26968ef91d452773ba77c0ae09244505  tomcat5-jspapi-5.0.30-6jpp_1fc.jar