SPECS: jakarta-servletapi5.spec - use own builddir - compile with ...

[glen]

Author: glen                         Date: Fri Dec  7 19:59:12 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use own builddir
- compile with java target 1.3
- provide versioned jakarta-servletapi
- java package unify

---- Files affected:
SPECS:
   jakarta-servletapi5.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/jakarta-servletapi5.spec
diff -u SPECS/jakarta-servletapi5.spec:1.4 SPECS/jakarta-servletapi5.spec:1.5
--- SPECS/jakarta-servletapi5.spec:1.4	Wed Apr 11 22:30:49 2007
+++ SPECS/jakarta-servletapi5.spec	Fri Dec  7 20:59:07 2007
@@ -4,17 +4,19 @@
 Summary(pl.UTF-8):	Klasy z implementacją Java Servlet i JSP
 Name:		jakarta-servletapi5
 Version:	5.5.23
-Release:	1
+Release:	2
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz
 # Source0-md5:	362d1d8b15dc09882440dcab8c592dd7
+Patch0:	%{name}-target.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant
+BuildRequires:	jdk >= 1.5
 BuildRequires:	jpackage-utils
-BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	rpm-javaprov
-BuildRequires:	jdk >= 1.5
+BuildRequires:	rpmbuild(macros) >= 1.300
+Provides:	jakarta-servletapi = %{version}
 Provides:	jsp
 Provides:	servlet
 Provides:	servlet24
@@ -46,10 +48,12 @@
 Dokumentacja do servletapi.
 
 %prep
-%setup -q -n apache-tomcat-%{version}-src
+%setup -qc
+cd apache-tomcat-%{version}-src
+%patch0 -p1
 
 %build
-cd servletapi/jsr154
+cd apache-tomcat-%{version}-src/servletapi/jsr154
 %ant dist \
 	-Dservletapi.build=build \
 	-Dservletapi.dist=dist
@@ -61,7 +65,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd servletapi
+cd apache-tomcat-%{version}-src/servletapi
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
 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
@@ -70,20 +74,15 @@
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr jsr152/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jsp-api
-cp -pr jsr154/dist/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/servlet-api
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -92,6 +91,7 @@
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -99,6 +99,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2007-12-07 19:59:07  glen
+- use own builddir
+- compile with java target 1.3
+- provide versioned jakarta-servletapi
+- java package unify
+
 Revision 1.4  2007-04-11 20:30:49  glen
 - need jdk >= 1.5 for org.xml.sax.ext.Attributes2
 
================================================================

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