SPECS: ApacheJServ.spec - started work

Fri Aug 19 14:29:07 CEST 2005

Author: glen                         Date: Fri Aug 19 12:29:07 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- started work

---- Files affected:
SPECS:
   ApacheJServ.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/ApacheJServ.spec
diff -u SPECS/ApacheJServ.spec:1.34 SPECS/ApacheJServ.spec:1.35

--- SPECS/ApacheJServ.spec:1.34	Tue Dec 14 17:59:55 2004
+++ SPECS/ApacheJServ.spec	Fri Aug 19 14:29:02 2005
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
 %define		jsdkversion	20000924
-%define		apxs		/usr/sbin/apxs
+%define		apxs		/usr/sbin/apxs1
 
 Summary:	Servlet engine with support for the leading web server
 Summary(pl):	Silnik serwletów ze wsparciem dla wiodącego serwera WWW
 Name:		ApacheJServ
 Version:	1.1.2
-Release:	1
+Release:	0.1
 License:	freely distributable & usable (JServ), LGPL (JSDK)
 Group:		Networking/Daemons
 Source0:	http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz
@@ -14,26 +14,28 @@
 Source1:	http://www.euronet.nl/~pauls/java/servlet/download/classpathx_servlet-%{jsdkversion}.tar.gz
 # Source1-md5:	a81feddb91b1358f9aaed94e83eddb54
 Patch0:		%{name}-enable-secret.patch
+Patch1:		%{name}-ac.patch
 URL:		http://java.apache.org/
-BuildRequires:	apache-devel >= 1.3.9-8
+BuildRequires:	apache1-devel >= 1.3.9-8
 BuildRequires:	jdk
 Requires(post):	awk
 Requires(post):	ed
-Requires(post,preun):	fileutils
 Requires(post):	grep
-Requires(post,preun):	sed
 Requires(post):	sh-utils
 Requires(post):	textutils
-Requires:	apache >= 1.3.6
-Provides:	jserv jsdk20
+Requires(post,preun):	fileutils
+Requires(post,preun):	sed
+Requires:	apache1 >= 1.3.6
+Provides:	jserv
+Provides:	jsdk20
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		libexecdir	%(%{apxs} -q LIBEXECDIR)
 %define		httpdconf	%(%{apxs} -q SYSCONFDIR)
 %define		jservconf	%{httpdconf}/jserv
 %define		logdir		/var/log/httpd
-%define		servletdir	/home/services/httpd/servlets
-%define		classesdir	/home/services/httpd/classes
+%define		servletdir	%{_datadir}/jserv/servlets
+%define		classesdir	%{_datadir}/jserv/classes
 
 %description
 Apache JServ is a servlet engine, developed by the Java Apache Project
@@ -57,6 +59,7 @@
 %prep
 %setup -q -a1
 %patch0 -p0
+%patch1 -p0
 
 # final position of GNU JSDK-Classes
 sed 's|@JSDK_CLASSES@|%{classesdir}/servlet-2.0.jar|g' \
@@ -69,12 +72,19 @@
 mv -f conf/jserv.conf.in.new conf/jserv.conf.in
 
 %build
+%{__gettextize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+#{__autoheader}
+#{__automake}
+
 # prepare compilation
 %{__make} -C classpathx_servlet-%{jsdkversion} jar_2_0
 %{__make} -C classpathx_servlet-%{jsdkversion}/apidoc
 
 # copy API-doc
-mkdir jsdk-doc
+mkdir -p jsdk-doc
 cp classpathx_servlet-%{jsdkversion}/README \
 	classpathx_servlet-%{jsdkversion}/AUTHORS \
 	classpathx_servlet-%{jsdkversion}/COPYING.LIB \
@@ -92,6 +102,7 @@
 	--with-servlets=%{servletdir} \
 	--with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar \
 	--with-jdk-home=%{_libdir}/java
+
 %{__make}
 
 %install
@@ -325,9 +336,9 @@
 %doc index.html LICENSE README docs jsdk-doc
 
 %dir %{jservconf}
-%config(noreplace) %verify(not size mtime md5) %{jservconf}/jserv.properties
-%config(noreplace) %verify(not size mtime md5) %{jservconf}/zone.properties
-%config(noreplace) %verify(not size mtime md5) %{jservconf}/jserv.conf
+%config(noreplace) %verify(not md5 mtime size) %{jservconf}/jserv.properties
+%config(noreplace) %verify(not md5 mtime size) %{jservconf}/zone.properties
+%config(noreplace) %verify(not md5 mtime size) %{jservconf}/jserv.conf
 
 # these are just for demonstration and thus,
 # no %config-files per-se; do not install
@@ -362,6 +373,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2005/08/19 12:29:02  glen
+- started work
+
 Revision 1.34  2004/12/14 16:59:55  baggins
 - DON'T hardcode java paths!
 
@@ -396,27 +410,27 @@
 - umask in scripts, other fixes/cosmetics where needed
 
 Revision 1.23  2002/12/07 23:49:18  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.22  2002/12/07 19:10:38  orzech
 - /home -> /home/services
 
 Revision 1.21  2002/12/07 14:32:49  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.20  2002/10/09 13:14:13  kloczek
 - use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
 
 Revision 1.19  2002/05/21 23:12:35  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
-             s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+            s/^automake -a -c -f/\%\{__automake\}/; \
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.18  2002/04/25 15:44:50  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.17  2002/04/05 15:26:37  roman
-s/Freely/freely in License
+- s/Freely/freely in License
 
 Revision 1.16  2002/03/24 23:28:12  kloczek
 - perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -429,28 +443,28 @@
   Group field using gettext).
 
 Revision 1.13  2002/01/18 02:12:09  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.12  2001/08/31 08:27:54  qboosh
 - added pl summary, s/Copyright/License/
 
 Revision 1.11  2001/05/02 00:42:06  qboosh
-- adapterized and made spec %%debug ready or using %%rpm*flags macros
+- adapterized and made spec %debug ready or using %rpm*flags macros
 
 Revision 1.10  2001/02/19 17:31:53  kloczek
 - more work (still NYF).
 
 Revision 1.9  2001/02/19 16:50:33  siefca
-fixed classpathx_servlet URL
+- fixed classpathx_servlet URL
 
 Revision 1.8  2000/06/09 07:54:38  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.7  2000/06/09 07:22:44  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.6  2000/05/30 23:23:14  arturs
--added /home/q/cvs/SPECSescription -l pl
+- added %description -l pl
 
 Revision 1.5  2000/05/17 00:36:12  kloczek
 - spec adapterized.
@@ -478,30 +492,30 @@
 - install process fixed for 'docs/api'
 
 * Tue Dec 28 1999 HZ <zeller at to.com>
- - use BuildRequires to reflect the need for current
-   versions of the autoconf/automake suite and a
-   recent apache-devel because of a bug in older
-   versions of this package.
+- use BuildRequires to reflect the need for current
+  versions of the autoconf/automake suite and a
+  recent apache-devel because of a bug in older
+  versions of this package.
 
 * Thu Sep 30 1999 HZ <zeller at to.com>
- - Release of 1.1 Beta 1
+- Release of 1.1 Beta 1
 
 * Wed Sep 29 1999 Henner Zeller <zeller at to.com>
- - new build scheme (1.1)
+- new build scheme (1.1)
 
 * Sun Sep 19 1999 Henner Zeller <zeller at to.com>
- - make it work with the apache-1.3.9 RPM
- - use 'test' instead of '[ ]' in conditionals
- - look for java virtual machine and edit jserv.properties' wrapper.bin
+- make it work with the apache-1.3.9 RPM
+- use 'test' instead of '[ ]' in conditionals
+- look for java virtual machine and edit jserv.properties' wrapper.bin
 
 * Fri Sep 17 1999 Henner Zeller <zeller at to.com>
- - added LGPL'ed servlet DK by Paul Siegmann
+- added LGPL'ed servlet DK by Paul Siegmann
 
 * Wed Aug 18 1999 Henner Zeller <zeller at to.com>
- - edit httpd.conf automatically
+- edit httpd.conf automatically
 
 * Sat Jul 24 1999 Henner Zeller <zeller at to.com>
- - update to install JServ 1.0.*
+- update to install JServ 1.0.*
 
 * Thu Nov 05 1998 Ross Golder <rossigee at bigfoot.com>
 - updated to use the autoconf build system
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.34&r2=1.35&f=u


