- fix improper usage of %%{_sysconfdir}

[packages/ApacheJServ.git] / ApacheJServ.spec

diff --git a/ApacheJServ.spec b/ApacheJServ.spec
index c8b1e21785cbfa41e04908eee12543829b926f59..1d5398b9a1a926f2e2a1c4dc9d19a2f85ae065c5 100644 (file)
--- a/ApacheJServ.spec
+++ b/ApacheJServ.spec
@@ -20,7 +20,7 @@ Source1:      http://www.euronet.nl/~pauls/java/servlet/download/classpathx_servlet-%
 Patch0:                %{name}-enable-secret.patch
 Patch1:                %{name}-DESTDIR.patch
 URL:           http://java.apache.org/
-License:       Freely distributable & usable
+License:       freely distributable & usable
 Group:         Networking/Daemons
 Requires:      apache >= 1.3.6
 Provides:      jserv jsdk20
@@ -70,9 +70,10 @@ mv conf/jserv.conf.in.new conf/jserv.conf.in
 
 %build
 # prepare compilation
-aclocal
-autoconf
-automake -a -c
+rm -f missing
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 
 %{__make} -C classpathx_servlet-%{jsdkversion} jar_2_0
 %{__make} -C classpathx_servlet-%{jsdkversion}/apidoc
@@ -106,10 +107,10 @@ echo "default - change on install `date`" > $RPM_BUILD_ROOT/%{jservconf}/jserv.s
 chmod 600 $RPM_BUILD_ROOT/%{jservconf}/jserv.secret.key
 
 # currently disabled
-#install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+#install -d $RPM_BUILD_ROOT/etc/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.init      $RPM_BUILD_ROOT/etc/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
 
@@ -342,7 +343,7 @@ sed 's|.*\(Include.*%{jservconf}/jserv.conf\)|#\1|g' \
 #%{jservconf}/jserv.conf.default
 
 %attr(-,nobody,nobody) %{jservconf}/jserv.secret.key
-#%config %{_sysconfdir}/rc.d/init.d/jserv
+#%config /etc/rc.d/init.d/jserv
 #%config %{_sysconfdir}/logrotate.d/jserv
 #%config %{_sysconfdir}/profile.d/jserv.sh