SPECS: ApacheJServ.spec - build using external servlet.jar - clean...

Sun Dec 9 02:01:51 CET 2007

Author: glen                         Date: Sun Dec  9 01:01:51 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build using external servlet.jar
- cleanups
- rel 5

---- Files affected:
SPECS:
   ApacheJServ.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/ApacheJServ.spec
diff -u SPECS/ApacheJServ.spec:1.61 SPECS/ApacheJServ.spec:1.62

--- SPECS/ApacheJServ.spec:1.61	Mon Sep 10 11:24:06 2007
+++ SPECS/ApacheJServ.spec	Sun Dec  9 02:01:46 2007
@@ -1,24 +1,16 @@
 # $Revision$, $Date$
-# TODO
-# - separate package for jsdk?
-#
-# Conditional build:
-%bcond_with	gcj	# use GCJ instead of javac
-#
 %define		apxs		/usr/sbin/apxs1
-%define		jsdkversion	20000924
 %define		mod_name	jserv
+%include	/usr/lib/rpm/macros.java
 Summary:	Servlet engine with support for the leading web server
 Summary(pl.UTF-8):	Silnik serwletów ze wsparciem dla wiodącego serwera WWW
 Name:		ApacheJServ
 Version:	1.1.2
-Release:	4
-License:	freely distributable & usable (JServ), LGPL (JSDK)
+Release:	5
+License:	freely distributable & usable
 Group:		Networking/Daemons
 Source0:	http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz
 # Source0-md5:	6d48a1b9fcc5eea4dfebaae29ba5a485
-Source1:	http://www.euronet.nl/~pauls/java/servlet/download/classpathx_servlet-%{jsdkversion}.tar.gz
-# Source1-md5:	a81feddb91b1358f9aaed94e83eddb54
 Source2:	%{name}.conf
 Source3:	%{name}.init
 Source4:	%{name}.sysconfig
@@ -27,42 +19,35 @@
 Patch1:		%{name}-ac.patch
 Patch2:		%{name}-jre-env.patch
 Patch3:		%{name}-config.patch
-URL:		http://java.apache.org/
+URL:		http://archive.apache.org/dist/java/jserv/
 BuildRequires:	apache1-devel >= 1.3.9-8
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	jdk
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
-%if %{with gcj}
-BuildRequires:	fastjar
-BuildRequires:	gcc-java
-BuildRequires:	jdkgcj
-Requires:	/usr/bin/gij
-%else
-BuildRequires:	java-sun
-Requires:	java-sun-jre
-%endif
+BuildRequires:	servlet = 2.0
 Requires(post,preun):	rc-scripts
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	%{name} = %{version}-%{release}
+Requires:	jre
 Requires:	rc-scripts >= 0.4.0.19
+Requires:	servlet = 2.0
 Provides:	group(jserv)
-Provides:	jsdk20
-Provides:	jserv
 Provides:	user(jserv)
+Obsoletes:	ApacheJServ-doc
 Obsoletes:	ApacheJServ-init
 Obsoletes:	jserv
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define		httpdconf	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 %define		_sysconfdir	/etc/jserv
-%define		logdir		/var/log/jserv
 %define		_noautocompressdoc  package-list
 
 %description
@@ -70,19 +55,14 @@
 <http://java.apache.org/>. The Apache JServ servlet engine is written
 in 100pc Java application, and listens for servlet requests using the
 Apache Java protocol (AJp). Typically, these requests will originate
-from the mod_jserv Apache module (DSO included). This package contains
-a LGPL'ed implementation of Sun's Java Servlet API version 2.0 by Paul
-Siegmann <http://www.euronet.nl/~pauls/java/servlet/>.
+from the mod_jserv Apache module (DSO included).
 
 %description -l pl.UTF-8
 Apache JServ jest silnikiem serwletowym, rozwijanym przez Java Apache
 Project <http://java.apache.org/>. Silnik serwletowy Apache JServ
 został napisany od początku do końca w Javie; nasłuchuje wywołań
 serwletu wykorzystując protokół Apache Java (AJp). Zazwyczaj wywołania
-te pochodzą z modułu Apache mod_jservmodule (łącznie z DSO). Pakiet
-ten zawiera implementację Java Servlet API Suna w wersji 2.0 napisaną
-przez Paula Siegmanna (na licencji LGPL)
-<http://www.euronet.nl/~pauls/java/servlet/>.
+te pochodzą z modułu Apache mod_jservmodule (łącznie z DSO).
 
 %package -n apache1-mod_jserv
 Summary:	JServ module for Apache
@@ -97,28 +77,18 @@
 %description -n apache1-mod_jserv -l pl.UTF-8
 Moduł JServ dla Apache'a.
 
-%package doc
-Summary:	ApacheJServ documentation
-Summary(pl.UTF-8):	Dokumentacja do ApacheJServ
-Group:		Development/Languages/Java
-
-%description doc
-ApacheJserv documentation.
-
-%description doc -l pl.UTF-8
-Dokumentacja do ApacheJServ.
-
 %prep
-%setup -q -a1
+%setup -q
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
 
-sed -i -e '
-	s|@JSDK_CLASSES@|%{_javadir}/servlet-2.0.jar|g
-	s|@JAVA@|%{_bindir}/java|g
-' conf/jserv.properties.in
+# servlet-2.0 is the highest version the jserv code compiles with
+sed -i -e "
+	s|@JSDK_CLASSES@|$(find-jar servlet-2.0)|g
+	s|@JAVA@|%java|g
+" conf/jserv.properties.in
 
 # do not load module in provided jserv.conf; we do this in httpd.conf
 sed -i -e 's|@LOAD_OR_NOT@|#|g' conf/jserv.conf.in
@@ -129,28 +99,13 @@
 
 %build
 export JAVA_HOME="%{java_home}"
-
-if [ ! -f _autotools.done.1 ]; then
+if [ ! -f _autotools.stamp ]; then
 	%{__gettextize}
 	%{__libtoolize}
 	%{__aclocal}
 	%{__autoconf}
 	%{__automake}
-	touch _autotools.done.1
-fi
-
-# prepare compilation
-if [ ! -f classpathx_servlet-%{jsdkversion}/servlet-2.0.jar ]; then
-	%{__make} -C classpathx_servlet-%{jsdkversion} jar_2_0
-fi
-
-if [ ! -d jsdk-doc ]; then
-	%{__make} -C classpathx_servlet-%{jsdkversion}/apidoc
-
-	# copy API-doc
-	mkdir jsdk-doc
-	cp classpathx_servlet-%{jsdkversion}/{README,AUTHORS,COPYING.LIB} jsdk-doc
-	cp -r classpathx_servlet-%{jsdkversion}/apidoc jsdk-doc
+	touch _autotools.stamp
 fi
 
 ### JSERV
@@ -159,10 +114,10 @@
 %configure \
 	%{!?debug:--disable-debugging} \
 	--with-apxs=%{apxs} \
-	--with-logdir=%{logdir} \
+	--with-logdir=/var/log/jserv \
 	--with-servlets=%{_datadir}/jserv/servlets \
 	--with-java-platform=1.4 \
-	--with-JSDK=$dir/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar \
+	--with-JSDK=$(find-jar servlet-2.0) \
 	%{!?with_gcj:GCJ=javac GCJFLAGS= CLASSPATH=$dir JAVAC_OPT="-source 1.4"} \
 	%{!?with_gcj:--with-javac=%{javac} --with-java=%{java} --with-jdk-home=$JAVA_HOME} \
 	%{?with_gcj:--with-javac=%{_bindir}/gcj --with-jar=%{_bindir}/fastjar} \
@@ -194,12 +149,6 @@
 
 install -d $RPM_BUILD_ROOT%{_datadir}/jserv/servlets
 
-### GNU JSDK-classes
-install classpathx_servlet-%{jsdkversion}/servlet-2.0.jar $RPM_BUILD_ROOT%{_javadir}
-
-find jsdk-doc -name 'Makefile*' | xargs rm -f
-rm -rf jsdk-doc/{COPYING.LIB,CVS} jsdk-doc/apidoc/CVS
-
 # duplicate
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/jserv.conf
 rm -rf $RPM_BUILD_ROOT%{_prefix}/docs
@@ -254,6 +203,7 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE README
+%doc index.html docs
 %dir %attr(750,root,jserv) %{_sysconfdir}
 %attr(640,root,jserv) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.secret.key
 %attr(640,root,jserv) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.properties
@@ -262,17 +212,9 @@
 %attr(755,root,root) %{_sbindir}/runjserv
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/jserv
 %{_javadir}/ApacheJServ.jar
-%{_javadir}/servlet-2.0.jar
 %dir %{_datadir}/jserv
 %dir %attr(750,root,jserv) %{_datadir}/jserv/servlets
-
-%if 0
-%{_datadir}/jserv/servlets/Hello.java
-%{_datadir}/jserv/servlets/Hello.class
-%{_datadir}/jserv/servlets/IsItWorking.java
-%{_datadir}/jserv/servlets/IsItWorking.class
-%endif
-%attr(770,root,jserv) %dir %{logdir}
+%attr(770,root,jserv) %dir /var/log/jserv
 
 %files -n apache1-mod_jserv
 %defattr(644,root,root,755)
@@ -280,17 +222,17 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{httpdconf}/conf.d/80_mod_jserv.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{httpdconf}/jserv.secret.key
 
-%files doc
-%defattr(644,root,root,755)
-%doc index.html docs
-%doc jsdk-doc
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2007-12-09 01:01:46  glen
+- build using external servlet.jar
+- cleanups
+- rel 5
+
 Revision 1.61  2007-09-10 09:24:06  glen
 - force java path to wrapper; rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ApacheJServ.spec?r1=1.61&r2=1.62&f=u

