-%define myprefix /usr
-
-# we should determine these places with apxs..
-# it would be nice to do this at install-time
-# as well in order to dynamically 'relocate' the package.
-# .. but I think we've to wait for a new RPM to make this happen
-##
-
-## unfortuatly, we don't know the location of the apxs-binary yet .. and
-## it may not be in the path which will make the build fail (can
-## we set defines conditionally ?)
-
#%define libexecdir `apxs -q LIBEXECDIR`
%define libexecdir /usr/lib/apache
%define logdir /var/log/httpd
%define servletdir /home/httpd/servlets
%define classesdir /home/httpd/classes
-%define jsdkversion 19991120
-
-Source: %{name}-%{version}.tar.gz
-Source1: http://www.euronet.nl/~pauls/java/servlet/download/classpathx_servlet-%{jsdkversion}.tar.gz
-Patch0: jserv-enable-secret.patch
-Patch1: ApacheJServ-1.1-megaloman.patch
+%define jsdkversion 20000924
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
Release: 3
+Source0: http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz
+Source1: http://www.euronet.nl/~pauls/java/servlet/download/classpathx_servlet-%{jsdkversion}.tar.gz
+Patch0: %{name}-enable-secret.patch
+Patch1: %{name}-DESTDIR.patch
URL: http://java.apache.org/
-Copyright: Freely distributable & usable
+License: freely distributable & usable
Group: Networking/Daemons
-Packager: Henner Zeller <zeller@to.com>
-Docdir: %{myprefix}/doc
Requires: apache >= 1.3.6
Provides: jserv jsdk20
-BuildRoot: /var/tmp/%{name}-%{version}-root
-Prefix: %{myprefix}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-#BuildRequires: any-java-compiler
+#BuildRequires: any-java-compiler
BuildRequires: automake >= 1.4
BuildRequires: autoconf >= 2.13
-BuildRequires: libtool >= 1.3.3
-
-## Building this package depending on standard RPM packages
-## requires the apxs utility to be there, located in the apache-devel package.
-## Because the RH 6.1 1.3.9-4 version has a bug, we need a newer package.
-## Comment this out if you want to build this SRC-RPM on your personal
-## installation of apache (and thus, apxs).
-## (dunno, at which particular release this was fixed .. -4 was faulty and
-## -8 works)
+BuildRequires: libtool >= 1.3.3
BuildRequires: apache-devel >= 1.3.9-8
%description
-Apache JServ is a servlet engine, developed by the
-Java Apache Project <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/>
+Apache JServ is a servlet engine, developed by the Java Apache Project
+<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/>
+
+%description -l pl
+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 sunowsk± implementacjê api serletów w javie w wersji 2.0
+(na licencji LGPL) napisana przez Paula Siegmanna
+<http://www.euronet.nl/~pauls/java/servlet/>
%prep
-rm -rf $RPM_BUILD_ROOT
-%setup -a 1 -n %{name}-%{version}
+%setup -q -a 1
-# enable socket authentification
%patch0
%patch1 -p1
-# final position of GNU JSDK-Classes
+# final position of GNU JSDK-Classes
sed 's|@JSDK_CLASSES@|%{classesdir}/servlet-2.0.jar|g' \
< conf/jserv.properties.in > conf/jserv.properties.in.new
mv conf/jserv.properties.in.new conf/jserv.properties.in
< conf/jserv.conf.in > conf/jserv.conf.in.new
mv conf/jserv.conf.in.new conf/jserv.conf.in
+%build
# prepare compilation
aclocal
-autoconf
-automake
+%{__autoconf}
+%{__automake}
-%build
-
-### jsdk API
-make -C classpathx_servlet-%{jsdkversion} jar_2_0
-make -C classpathx_servlet-%{jsdkversion}/apidoc
+%{__make} -C classpathx_servlet-%{jsdkversion} jar_2_0
+%{__make} -C classpathx_servlet-%{jsdkversion}/apidoc
# copy API-doc
mkdir jsdk-doc
jsdk-doc
cp -r classpathx_servlet-%{jsdkversion}/apidoc jsdk-doc
-
### JSERV
-# find apxs utility ..
-# .. in PATH
-APXS_UTIL=`type -p apxs || true`
-
-# .. from RPM
-if test "x$APXS_UTIL" = x ; then
- # mmh, is it possible to query just for
- # the executeables (like -qd and -qc) ?
- APXSMATCH=`rpm -ql apache-devel apache | grep apxs`
- for f in $APXSMATCH ; do
- if test -x "$f" ; then
- APXS_UTIL=$f
- break
- fi
- done
-fi
-
-# .. at usual places
-if test "x$APXS_UTIL" = x ; then
- for loc in \
- /usr/bin \
- /usr/sbin \
- /usr/local/apache/bin \
- /usr/local/apache/sbin \
- /usr/local/httpd/bin \
- /usr/local/httpd/sbin
- do
- if test -x "$loc/apxs" ; then
- APXS_UTIL="$loc/apxs"
- break
- fi
- done
-fi
-
-if test "x$APXS_UTIL" = x ; then
- echo "Didn't find apxs .. exiting"
- exit -1
-fi
-
APXS_CFLAGS=`$APXS_UTIL -q CFLAGS`
-CFLAGS="$APXS_CFLAGS $RPM_OPT_FLAGS" ./configure \
- --prefix=%{myprefix} \
- --disable-debugging \
- --with-apxs=$APXS_UTIL \
- --with-logdir=%{logdir} \
+CFLAGS="$APXS_CFLAGS %{rpmcflags}" ./configure \
+ --prefix=%{_prefix} \
+ --disable-debugging \
+ --with-apxs=/usr/sbin/apxs \
+ --with-logdir=%{logdir} \
--with-servlets=%{servletdir} \
--with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar
-make
+%{__make}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} DESTDIR=$RPM_BUILD_ROOT install
echo "default - change on install `date`" > $RPM_BUILD_ROOT/%{jservconf}/jserv.secret.key
chmod 600 $RPM_BUILD_ROOT/%{jservconf}/jserv.secret.key
# currently disabled
-#install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-#install -d $RPM_BUILD_ROOT/etc/profile.d
-#install -d $RPM_BUILD_ROOT/etc/logrotate.d
-#install -m755 src/scripts/package/rpm/jserv.init $RPM_BUILD_ROOT/etc/rc.d/init.d/jserv
-#install -m755 src/scripts/package/rpm/jserv.sh $RPM_BUILD_ROOT/etc/profile.d
-#install -m644 src/scripts/package/rpm/jserv.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/jserv
+#install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+#install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+#install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+#install -m755 src/scripts/package/rpm/jserv.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/jserv
+#install -m755 src/scripts/package/rpm/jserv.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+#install -m644 src/scripts/package/rpm/jserv.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/jserv
### GNU JSDK-classes
install -d ${RPM_BUILD_ROOT}%{classesdir}
# use fortune + install-date + process-list to create pseudo-random, hardly
# guessable secret key. Use md5sum to create a hash from this, if available:
-(/usr/games/fortune 2>/dev/null ; date ; ps -eal 2>/dev/null) \
+(%{_prefix}/games/fortune 2>/dev/null ; date ; ps -eal 2>/dev/null) \
| (md5sum 2>/dev/null || cat) \
- > %{jservconf}/jserv.secret.key
+ > %{jservconf}/jserv.secret.key
chmod 600 %{jservconf}/jserv.secret.key
#
> %{httpdconf}/httpd.conf
else
# append it
- (
+ (
echo "<IfModule mod_jserv.c>"
echo " Include %{jservconf}/jserv.conf"
echo "</IfModule>"
SERVERPORT=""
fi
-#FIXME: make this i18n-aware
+#FIXME: make this i18n-aware
if test ! "x$JAVABIN" = x ; then
echo "using java VM $JAVABIN"
echo "Please send comments/suggestions regarding"
echo "this RPM to <zeller@to.com>."
-
%preun
# do not remove the configured stuff if we upgrade.
# the $1 argument contains the number of packages _after_ installation.
/bin/rm -fr %{logdir}/jserv.log
%files
-%defattr(-,root,root)
-# mmh, we can't give %{prefix}/docs to %doc ..
+%defattr(644,root,root,755)
+# mmh, we can't give %{_prefix}/docs to %doc ..
%doc index.html README docs jsdk-doc
%dir %{jservconf}
#%{jservconf}/jserv.conf.default
%attr(-,nobody,nobody) %{jservconf}/jserv.secret.key
-#%config /etc/rc.d/init.d/jserv
-#%config /etc/logrotate.d/jserv
-#%config /etc/profile.d/jserv.sh
+#%config %{_sysconfdir}/rc.d/init.d/jserv
+#%config %{_sysconfdir}/logrotate.d/jserv
+#%config %{_sysconfdir}/profile.d/jserv.sh
%{libexecdir}/mod_jserv.so
%{libexecdir}/ApacheJServ.jar
# we need to have write access here
%attr(-,nobody,-) %dir %{logdir}
-
-%changelog
-* Sun Feb 13 2000 Peter Hanecak <hanecak@megaloman.sk>
-- used 'APXS_CFLAGS=`$APXS_UTIL -q CFLAGS`' and
- 'CFLAGS="$APXS_CFLAGS $RPM_OPT_FLAGS"' to determine build flags
- (because of EAPI)
-
-* Tue Feb 8 2000 Peter Hanecak <hanecak@megaloman.sk>
-- RPM_OPT_FLAGS passed to CFLAGS
-- build root changed from '/tmp/...' to '/var/tmp/...'
-- install process fixed for 'docs/api'
-
-* Tue Dec 28 1999 HZ <zeller@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.
-
-* Thu Sep 30 1999 HZ <zeller@to.com>
- - Release of 1.1 Beta 1
-
-* Wed Sep 29 1999 Henner Zeller <zeller@to.com>
- - new build scheme (1.1)
-
-* Sun Sep 19 1999 Henner Zeller <zeller@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
-
-* Fri Sep 17 1999 Henner Zeller <zeller@to.com>
- - added LGPL'ed servlet DK by Paul Siegmann
-
-* Wed Aug 18 1999 Henner Zeller <zeller@to.com>
- - edit httpd.conf automatically
-
-* Sat Jul 24 1999 Henner Zeller <zeller@to.com>
- - update to install JServ 1.0.*
-
-* Thu Nov 05 1998 Ross Golder <rossigee@bigfoot.com>
-- updated to use the autoconf build system
-
-* Mon Oct 19 1998 Ross Golder <rossg@cpd.co.uk>
-- created from previous work to deploy daily snapshot RPMs
projects / packages / ApacheJServ.git / blobdiff