SPECS: java-servletapi5.spec, jakarta-servletapi5.spec (REMOVED) - rename t...

[glen]

Author: glen                         Date: Sun Nov 23 23:52:38 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename to java-servletapi5.spec

---- Files affected:
SPECS:
   java-servletapi5.spec (1.9 -> 1.10) , jakarta-servletapi5.spec (1.9 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-servletapi5.spec
diff -u SPECS/java-servletapi5.spec:1.9 SPECS/java-servletapi5.spec:1.10
--- SPECS/java-servletapi5.spec:1.9	Fri Apr 11 09:19:49 2008
+++ SPECS/java-servletapi5.spec	Mon Nov 24 00:52:33 2008
@@ -1,29 +1,33 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Java servlet and JSP implementation classes
 Summary(pl.UTF-8):	Klasy z implementacją Java Servlet i JSP
-Name:		jakarta-servletapi5
+Name:		java-servletapi5
 Version:	5.5.26
 Release:	1
 License:	Apache
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz
 # Source0-md5:	642b6526354cb18c5b5d77ebef8109ae
-Patch0:		%{name}-target.patch
+Patch0:		jakarta-servletapi5-target.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant
-BuildRequires:	jdk >= 1.5
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jpackage-utils
-Provides:	jakarta-servletapi = %{version}
+Provides:	jakarta-servletapi5
 Provides:	jsp
 Provides:	servlet = %{version}
 Provides:	servlet24
 Provides:	servlet5
 Provides:	servletapi5
 Obsoletes:	jakarta-servletapi < 4
+Obsoletes:	jakarta-servletapi5
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,11 +55,10 @@
 
 %prep
 %setup -qc
-cd apache-tomcat-%{version}-src
-%patch0 -p1
+mv apache-tomcat-%{version}-src/servletapi/* .
+%patch0 -p2
 
 %build
-cd apache-tomcat-%{version}-src/servletapi
 %ant -f jsr154/build.xml dist \
 	-Dservletapi.build=build \
 	-Dservletapi.dist=dist
@@ -66,24 +69,26 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd apache-tomcat-%{version}-src/servletapi
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+
 # JSP 2.0 and Servlet 2.4 classes
-install jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{version}.jar
-install jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{version}.jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+cp -a jsr152/dist/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{version}.jar
+cp -a jsr154/dist/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{version}.jar
 ln -s servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
 ln -s servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet.jar
 ln -s jsp-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
 
 # not sure who expects what from which class
-# servletapi4 contained both servlet-api and jsp-api classes in it's jar
+# servletapi4 contained both servlet-api and jsp-api classes in it's jar, so we link to api jar (or drop?)
 ln -s servlet-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servletapi5.jar
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a jsr152/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jsp-api
 cp -a jsr154/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/servlet-api
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,10 +100,12 @@
 %defattr(644,root,root,755)
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -106,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2008/11/23 23:52:33  glen
+- rename to java-servletapi5.spec
+
 Revision 1.9  2008/04/11 07:19:49  glen
 - update to 5.5.26
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-servletapi5.spec?r1=1.9&r2=1.10&f=u