- 1.1.2 (the last version), removed obsolete DESTDIR patch

Changed files:
    ApacheJServ-DESTDIR.patch -> 1.2
    ApacheJServ.spec -> 1.25

diff --git a/ApacheJServ-DESTDIR.patch b/ApacheJServ-DESTDIR.patch
deleted file mode 100644 (file)
index a80df62..0000000
--- a/ApacheJServ-DESTDIR.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -uNr ApacheJServ-1.1.orig/docs/api/Makefile.am ApacheJServ-1.1/docs/api/Makefile.am
---- ApacheJServ-1.1.orig/docs/api/Makefile.am  Sun Nov 21 19:47:14 1999
-+++ ApacheJServ-1.1/docs/api/Makefile.am       Tue Feb  8 16:53:25 2000
-@@ -32,8 +32,8 @@
-               echo ""; \
-               echo "Installing Javadoc in ${docdir}..."; \
-               echo ""; \
--              ${mkinstalldirs} ${docdir}; \
--              ${CP} -r ${FILES} ${docdir}; \
-+              ${mkinstalldirs} $(DESTDIR)${docdir}; \
-+              ${CP} -r ${FILES} $(DESTDIR)${docdir}; \
-       else \
-               echo "You received this message for one of two reasons:"; \
-               echo ""; \
-diff -uNr ApacheJServ-1.1.orig/docs/api/Makefile.in ApacheJServ-1.1/docs/api/Makefile.in
---- ApacheJServ-1.1.orig/docs/api/Makefile.in  Tue Feb  8 16:46:09 2000
-+++ ApacheJServ-1.1/docs/api/Makefile.in       Tue Feb  8 16:53:02 2000
-@@ -235,8 +235,8 @@
-               echo ""; \
-               echo "Installing Javadoc in ${docdir}..."; \
-               echo ""; \
--              ${mkinstalldirs} ${docdir}; \
--              ${CP} -r ${FILES} ${docdir}; \
-+              ${mkinstalldirs} $(DESTDIR)${docdir}; \
-+              ${CP} -r ${FILES} $(DESTDIR)${docdir}; \
-       else \
-               echo "You received this message for one of two reasons:"; \
-               echo ""; \

diff --git a/ApacheJServ.spec b/ApacheJServ.spec
index 5b6a19c957fba04a32b46ce79a7f2a6eded55202..655ccd2f8a6a48b9257a54c445aebaeeaa8a2bc5 100644 (file)
--- a/ApacheJServ.spec
+++ b/ApacheJServ.spec
@@ -4,19 +4,15 @@
 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
+Version:       1.1.2
+Release:       1
 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/
-License:       freely distributable & usable
+License:       freely distributable & usable (JServ), LGPL (JSDK)
 Group:         Networking/Daemons
 BuildRequires: apache-devel >= 1.3.9-8
-BuildRequires: autoconf >= 2.13
-BuildRequires: automake >= 1.4
-BuildRequires: libtool >= 1.3.3
 BuildRequires: jdk
 Requires(post):        awk
 Requires(post):        ed
@@ -57,8 +53,7 @@ ten zawiera sunowsk
 
 %prep
 %setup -q -a1
-%patch0
-%patch1 -p1
+%patch0 -p0
 
 # final position of GNU JSDK-Classes
 sed 's|@JSDK_CLASSES@|%{classesdir}/servlet-2.0.jar|g' \
@@ -72,11 +67,6 @@ mv -f conf/jserv.conf.in.new conf/jserv.conf.in
 
 %build
 # prepare compilation
-rm -f missing
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-
 %{__make} -C classpathx_servlet-%{jsdkversion} jar_2_0
 %{__make} -C classpathx_servlet-%{jsdkversion}/apidoc
 
@@ -97,7 +87,8 @@ CFLAGS="$APXS_CFLAGS %{rpmcflags}" ./configure \
        --with-apxs=%{apxs} \
        --with-logdir=%{logdir} \
        --with-servlets=%{servletdir} \
-       --with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar
+       --with-JSDK=`pwd`/classpathx_servlet-%{jsdkversion}/servlet-2.0.jar \
+       --with-jdk-home=/usr/lib/java
 %{__make}
 
 %install
@@ -120,6 +111,9 @@ chmod 600 $RPM_BUILD_ROOT%{jservconf}/jserv.secret.key
 install -d $RPM_BUILD_ROOT%{classesdir}
 install classpathx_servlet-%{jsdkversion}/servlet-2.0.jar $RPM_BUILD_ROOT%{classesdir}
 
+find docs jsdk-doc -name 'Makefile*' | xargs rm -f
+rm -rf jsdk-doc/{COPYING.LIB,CVS}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -326,12 +320,12 @@ sed 's|.*\(Include.*%{jservconf}/jserv.conf\)|#\1|g' \
 %files
 %defattr(644,root,root,755)
 # mmh, we can't give %{_prefix}/docs to %doc ..
-%doc index.html README docs jsdk-doc
+%doc index.html LICENSE README docs jsdk-doc
 
 %dir %{jservconf}
-%config %{jservconf}/jserv.properties
-%config %{jservconf}/zone.properties
-%config %{jservconf}/jserv.conf
+%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
 
 # these are just for demonstration and thus,
 # no %config-files per-se; do not install
@@ -340,20 +334,22 @@ sed 's|.*\(Include.*%{jservconf}/jserv.conf\)|#\1|g' \
 #%{jservconf}/zone.properties.default
 #%{jservconf}/jserv.conf.default
 
-%attr(-,nobody,nobody) %{jservconf}/jserv.secret.key
+%attr(600,http,http) %{jservconf}/jserv.secret.key
 #%config /etc/rc.d/init.d/jserv
 #%config /etc/logrotate.d/jserv
 #%config /etc/profile.d/jserv.sh
 
-%{libexecdir}/mod_jserv.so
+%attr(755,root,root) %{libexecdir}/mod_jserv.so
 %{libexecdir}/ApacheJServ.jar
 
 %dir %{classesdir}
 %{classesdir}/servlet-2.0.jar
 
 %dir %{servletdir}
+%{servletdir}/Hello.java
+%{servletdir}/Hello.class
 %{servletdir}/IsItWorking.java
 %{servletdir}/IsItWorking.class
 
 # we need to have write access here
-%attr(-,nobody,-) %dir %{logdir}
+%attr(770,root,http) %dir %{logdir}