- many small fixes, mostly inpired by kloczek

Changed files:
    ApacheJServ.spec -> 1.29

diff --git a/ApacheJServ.spec b/ApacheJServ.spec
index e871cd1a83e508a71593138bb2ceb702f9bcbb5c..f3717c73ea93fb9d63228b567867eff1c4807b96 100644 (file)
--- a/ApacheJServ.spec
+++ b/ApacheJServ.spec
@@ -6,14 +6,14 @@ Summary(pl):  Silnik serwlet
 Name:          ApacheJServ
 Version:       1.1.2
 Release:       1
+License:       freely distributable & usable (JServ), LGPL (JSDK)
+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
 Patch0:                %{name}-enable-secret.patch
 URL:           http://java.apache.org/
-License:       freely distributable & usable (JServ), LGPL (JSDK)
-Group:         Networking/Daemons
 BuildRequires: apache-devel >= 1.3.9-8
 BuildRequires: jdk
 Requires(post):        awk
@@ -95,22 +95,21 @@ CFLAGS="$APXS_CFLAGS %{rpmcflags}" ./configure \
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{classesdir}
+#install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,profile.d,logrotate.d}
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 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
 
 ### GNU JSDK-classes
-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