Author: glen Date: Thu Sep 22 17:40:23 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - spearate package for apache module - create constant secret.key file so it's not always created as .rpmnew with upgrade
---- Files affected: SPECS: ApacheJServ.spec (1.40 -> 1.41) ---- Diffs: ================================================================ Index: SPECS/ApacheJServ.spec diff -u SPECS/ApacheJServ.spec:1.40 SPECS/ApacheJServ.spec:1.41 --- SPECS/ApacheJServ.spec:1.40 Wed Aug 24 19:27:15 2005 +++ SPECS/ApacheJServ.spec Thu Sep 22 19:40:17 2005 @@ -11,7 +11,7 @@ Summary(pl): Silnik serwletów ze wsparciem dla wiodącego serwera WWW Name: ApacheJServ Version: 1.1.2 -Release: 0.27 +Release: 0.33 License: freely distributable & usable (JServ), LGPL (JSDK) Group: Networking/Daemons Source0: http://java.apache.org/jserv/dist/%{name}-%{version}.tar.gz @@ -34,8 +34,6 @@ %else BuildRequires: jdk %endif -Requires(post,preun): rc-scripts -Requires: apache1 >= 1.3.33-2 Provides: jserv Provides: jsdk20 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -66,6 +64,15 @@ przez Paula Siegmanna (na licencji LGPL) <http://www.euronet.nl/~pauls/java/servlet/>. +%package -n apache1-mod_jserv +Summary: JServ module for Apache +Group: Networking/Daemons +Requires: %{name} = %{version}-%{release} +Requires: apache1 >= 1.3.33-2 + +%description -n apache1-mod_jserv +Apache JServ apache module. + %package init Summary: ApacheJServ initscript Summary(pl): Skrypt startowy ApacheJServ @@ -75,6 +82,7 @@ Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/groupadd +Requires(post,preun): rc-scripts %description init JServ initscript for standalone mode. @@ -167,7 +175,7 @@ -C src/java \ DESTDIR=$RPM_BUILD_ROOT -echo "default - change on install `date`" > $RPM_BUILD_ROOT%{_sysconfdir}/jserv.secret.key +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 @@ -191,14 +199,15 @@ dd if=/dev/urandom bs=1 count=42 2>/dev/null \ | (md5sum 2>/dev/null || cat) > %{_sysconfdir}/jserv.secret.key fi + +%post -n apache1-mod_jserv %service apache restart -%postun +%postun -n apache1-mod_jserv if [ "$1" = "0" ]; then %service -q apache restart fi - %pre init %groupadd -P %{name}-init -g 154 jserv %useradd -P %{name}-init -u 154 -g jserv -d /etc/jserv -c "JServ User" jserv @@ -224,15 +233,9 @@ %defattr(644,root,root,755) %doc LICENSE README %dir %{_sysconfdir} -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{httpdconf}/conf.d/*_mod_jserv.conf -%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.properties -%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zone.properties -%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.secret.key -#%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/jserv -#%config /etc/profile.d/jserv.sh - -%attr(755,root,root) %{_pkglibdir}/mod_jserv.so - +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.properties +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zone.properties +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jserv.secret.key %{_javadir}/ApacheJServ.jar %{_javadir}/servlet-2.0.jar @@ -244,6 +247,10 @@ %{servletdir}/IsItWorking.class %endif +%files -n apache1-mod_jserv +%defattr(644,root,root,755) +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{httpdconf}/conf.d/*_mod_jserv.conf +%attr(755,root,root) %{_pkglibdir}/mod_jserv.so %attr(770,root,http) %dir %{logdir} %files init @@ -261,6 +268,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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 + Revision 1.40 2005/08/24 17:27:15 qboosh - pl updates and fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ApacheJServ.spec?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
