SPECS: jakarta-servletapi.spec - BR: jpackage-utils, rpmbuild(macr...

[jajcus]

Author: jajcus                       Date: Wed May 24 10:55:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: jpackage-utils, rpmbuild(macros) >= 1.300
- -javadoc subpackage for API documentation
- versioned JAR

---- Files affected:
SPECS:
   jakarta-servletapi.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/jakarta-servletapi.spec
diff -u SPECS/jakarta-servletapi.spec:1.19 SPECS/jakarta-servletapi.spec:1.20
--- SPECS/jakarta-servletapi.spec:1.19	Fri May 19 13:28:19 2006
+++ SPECS/jakarta-servletapi.spec	Wed May 24 12:55:14 2006
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# TODO:
+#	- find some decent replacement. this package is old and
+#	obsoleted, but seems good enough as build dependency
 Summary:	Java Servlet and JSP API Classes
 Summary(pl):	Klasy API z implementacją Java Servlet i JSP
 Name:		jakarta-servletapi
@@ -10,15 +14,16 @@
 # Source0-md5:	cbf88ed51ee2be5a6ce3bace9d8bdb62
 URL:		http://jakarta.apache.org/tomcat/index.html
 BuildRequires:	ant >= 1.3
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jre
 Provides:	servlet
 Provides:	servlet4
 Provides:	servlet23
 BuildArch:	noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 This subproject contains the compiled code for the implementation
 classes of the Java Servlet and JSP APIs (packages javax.servlet,
@@ -30,28 +35,31 @@
 javax.servlet, javax.servlet.http, javax.servlet.jsp, and
 javax.servlet.jsp.tagext).
 
-%package doc
+%package javadoc
 Summary:	servletapi documentation
 Summary(pl):	Dokumentacja do servletapi
 Group:		Development/Languages/Java
 
-%description doc
+%description javadoc
 servletapi documentation.
 
-%description doc -l pl
+%description javadoc -l pl
 Dokumentacja do servletapi.
 
 %prep
 %setup -q -n %{name}-%{version}-src
 
 %build
+unset CLASSPATH || :
+export JAVA_HOME="%{java_home}"
 ant dist -Dservletapi.build=build -Dservletapi.dist=dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-install dist/lib/*.jar $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+install dist/lib/servlet.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/servlet.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,11 +67,11 @@
 %files
 %defattr(644,root,root,755)
 %doc BUILDING.txt LICENSE README.txt
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc dist/docs/*
+%doc %{_javadocdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -71,6 +79,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2006/05/24 10:55:14  jajcus
+- BR: jpackage-utils, rpmbuild(macros) >= 1.300
+- -javadoc subpackage for API documentation
+- versioned JAR
+
 Revision 1.19  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-servletapi.spec?r1=1.19&r2=1.20&f=u