rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.29, 1.30 java-1.4.2-gcj-compat.spec, 1.92, 1.93 sources, 1.33, 1.34

[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-serv11533

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
Remove servletapi and jspapi now that tomcat5 is buil


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	20 Jul 2005 10:08:11 -0000	1.29
+++ .cvsignore	21 Jul 2005 14:55:53 -0000	1.30
@@ -1,5 +1,3 @@
 java-gcj-compat-1.0.35.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.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- java-1.4.2-gcj-compat.spec	20 Jul 2005 11:07:48 -0000	1.92
+++ java-1.4.2-gcj-compat.spec	21 Jul 2005 14:55:53 -0000	1.93
@@ -20,7 +20,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_40rh
+%define release		40jpp_41rh
 %define cname           java-%{javaver}-%{origin}
 #%define bcarchivever	127
 
@@ -45,8 +45,6 @@
 #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}
@@ -69,13 +67,6 @@
 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
@@ -224,8 +215,6 @@
 %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
 %ifnarch ia64
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
 install -m755 eclipse-ecj.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
@@ -441,9 +430,6 @@
 %{_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)
@@ -466,6 +452,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Jul 21 2005 Gary Benson <gbenson redhat com> 0:1.4.2.0-40jpp_41rh
+- Remove servletapi and jspapi now that tomcat5 is built.
+
 * Wed Jul 20 2005 Gary Benson <gbenson redhat com> 0:1.4.2.0-40jpp_40rh
 - Import java-gcj-compat 1.0.35.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	20 Jul 2005 10:08:11 -0000	1.33
+++ sources	21 Jul 2005 14:55:53 -0000	1.34
@@ -1,5 +1,3 @@
 24835238b3c12ae5238742975de7549c  java-gcj-compat-1.0.35.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