rpms/tomcat5/devel tomcat5.spec,1.127,1.128

[Devrim GÜNDÜZ]

Author: devrim

Update of /cvs/extras/rpms/tomcat5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30197

Modified Files:
	tomcat5.spec 
Log Message:
- Fix build problems with --with apisonly. Patch from Karsten Hopp.




Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- tomcat5.spec	20 Apr 2009 13:45:23 -0000	1.127
+++ tomcat5.spec	5 May 2009 16:17:54 -0000	1.128
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 6.3%{dist}
+Release: 6.4%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -108,6 +108,7 @@ Patch18: %{name}-%{majversion}-skip-jsp-
 # 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
+Patch20: %{name}-%{majversion}-apisonlybuildfix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
 %if ! %{gcj_support}
@@ -374,6 +375,7 @@ Provides: jasper5-javadoc
 Javadoc for generated documentation %{name}-%{jname}
 %endif
 
+%if %{without_apisonly}
 %if %{with_ecj}
 %package jasper-eclipse
 Group: Text Editors/Integrated Development Environments (IDE)
@@ -383,6 +385,7 @@ Summary: Jasper OSGi Eclipse plugin
 Jasper OSGi Eclipse plugin that contains class files from jasper-compiler,
 jasper-runtime and ECJ.
 %endif
+%endif
 
 %prep
 %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
@@ -457,7 +460,9 @@ commons-collections.jar=$(build-classpat
 commons-logging.jar=$(build-classpath commons-logging)
 commons-daemon.jar=$(build-classpath commons-daemon)
 junit.jar=$(build-classpath junit)
+%if %{without_apisonly}
 jasper-compiler-jdt.jar=$(build-classpath ecj)
+%endif
 EOBP
     ant -Djava.home="%{java_home}" -Dbuild.compiler="modern" javadoc
 popd
@@ -491,7 +496,9 @@ jmxri.jar=$(build-classpath mx4j/mx4j-jm
 junit.jar=$(build-classpath junit)
 regexp.jar=$(build-classpath regexp)
 servlet-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
+%if %{without_apisonly}
 jsp-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
+%endif
 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)
@@ -549,6 +556,7 @@ EOBP
 popd
 %endif
 
+%if %{without_apisonly}
 # create jasper-eclipse jar
 %if %{with_ecj}
 mkdir -p org.apache.jasper
@@ -562,6 +570,7 @@ rm -f plugin.properties plugin.xml about
 zip -qq -r ../org.apache.jasper_5.5.17.v200706111724.jar .
 popd
 %endif
+%endif
 
 # inject OSGi manifests
 mkdir -p META-INF
@@ -570,7 +579,9 @@ touch META-INF/MANIFEST.MF
 zip -u %{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar META-INF/MANIFEST.MF
 cp -p %{SOURCE9} META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
+%if %{without_apisonly}
 zip -u %{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar META-INF/MANIFEST.MF
+%endif
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -871,8 +882,11 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version
             servletapi5.jar
     popd
     # depmap frag for standard alternative
-    %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
+    %if %{without_apisonly}
+       %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/ ||:
     %{__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
@@ -894,8 +908,10 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version
         %{__ln_s} -f %{name}-jsp-%{jspspec}-api-%{version}.jar \
             jspapi.jar
     popd
-    %add_to_maven_depmap javax.servlet jsp-api %{jspspec} JPP jsp_2_0_api
-    %add_to_maven_depmap tomcat jsp-api %{version} JPP %{name}-jsp-%{jspspec}-api
+    %if %{without_apisonly}
+       %add_to_maven_depmap javax.servlet jsp-api %{jspspec} JPP jsp_2_0_api
+       %add_to_maven_depmap tomcat jsp-api %{version} JPP %{name}-jsp-%{jspspec}-api
+    %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
@@ -927,10 +943,12 @@ pushd ${RPM_BUILD_DIR}/%{name}-%{version
 popd
 %endif
 
+%if %{without_apisonly}
 %if %{with_ecj}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
 %{__cp} -p org.apache.jasper_5.5.17.v200706111724.jar ${RPM_BUILD_ROOT}%{_datadir}/eclipse/plugins
 %endif
+%endif
 
 %if %{gcj_support}
 # Remove non-standard jars from the list for aot compilation 
@@ -1352,6 +1370,7 @@ fi
 %{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
 %{_javadocdir}/%{name}-jsp-%{jspspec}-api
 
+%if %{without_apisonly}
 %if %{with_ecj}
 %files jasper-eclipse
 %defattr(0644,root,root,0755)
@@ -1359,8 +1378,12 @@ fi
 %dir %{_datadir}/eclipse/plugins
 %{_datadir}/eclipse/plugins/org.apache.jasper_*
 %endif
+%endif
 
 %changelog
+* Tue May 5 2009 Devrim GUNDUZ <devrim at gunduz.org> 0:5.5.27-6.4
+- Fix build problems with --with apisonly. Patch from Karsten Hopp.
+
 * Mon Apr 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:5.5.27-6.3
 - Update jasper-OSGi-MANIFEST.MF for eclipse 3.5.