Author: glen Date: Thu Sep 22 18:26:50 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanup
---- Files affected: SPECS: ApacheJServ.spec (1.41 -> 1.42) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.41 SPECS/ApacheJServ.spec:1.42 --- SPECS/ApacheJServ.spec:1.41 Thu Sep 22 19:40:17 2005 +++ SPECS/ApacheJServ.spec Thu Sep 22 20:26:45 2005 @@ -3,7 +3,7 @@ # - separate package for jsdk? # # Conditional build: -%bcond_with gcj # use javac instead of GCJ +%bcond_with gcj # use GCJ instead of javac # %define apxs /usr/sbin/apxs1 %define jsdkversion 20000924 @@ -11,7 +11,7 @@ Summary(pl): Silnik serwletów ze wsparciem dla wiodącego serwera WWW Name: ApacheJServ Version: 1.1.2 -Release: 0.33 +Release: 0.34 License: freely distributable & usable (JServ), LGPL (JSDK) Group: Networking/Daemons Source0: http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz @@ -160,16 +160,15 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_javadir} -install -d $RPM_BUILD_ROOT/etc/apache/conf.d -install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,profile.d,logrotate.d} -install %{SOURCE2} $RPM_BUILD_ROOT/etc/apache/conf.d/81_mod_jserv.conf +install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{httpdconf}/conf.d,%{_javadir}} + +install %{SOURCE2} $RPM_BUILD_ROOT%{httpdconf}/conf.d/81_mod_jserv.conf install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/jserv %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -# we removed java, so do it manually +# we removed java from SUBDIRS, so do it manually %{__make} install \ %{!?with_gcj:OBJEXT=class JAVAC_OPT='-source 1.4'} \ -C src/java \ @@ -177,11 +176,6 @@ echo "default - change on install" > $RPM_BUILD_ROOT%{_sysconfdir}/jserv.secret.key -# currently disabled -#install src/scripts/package/rpm/jserv.init $RPM_BUILD_ROOT/etc/rc.d/init.d/jserv -#install src/scripts/package/rpm/jserv.sh $RPM_BUILD_ROOT/etc/profile.d -#install src/scripts/package/rpm/jserv.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/jserv - ### GNU JSDK-classes install classpathx_servlet-%{jsdkversion}/servlet-2.0.jar $RPM_BUILD_ROOT%{_javadir} @@ -268,6 +262,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.42 2005/09/22 18:26:45 glen +- cleanup + Revision 1.41 2005/09/22 17:40:17 glen - spearate package for apache module - create constant secret.key file so it's not always created as .rpmnew with upgrade ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.41&r2=1.42&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
