Author: czarny Date: Sat Dec 3 18:59:41 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - apache conf file - apache install scripts
---- Files affected: SPECS: acid.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/acid.spec diff -u SPECS/acid.spec:1.15 SPECS/acid.spec:1.16 --- SPECS/acid.spec:1.15 Mon Apr 25 12:29:54 2005 +++ SPECS/acid.spec Sat Dec 3 19:59:36 2005 @@ -3,11 +3,12 @@ Summary(pl): Konsola do analizy baz danych o incydentach (ACID) Name: acid Version: 0.9.6b23 -Release: 4 +Release: 5 License: GPL/PHP Group: Applications/WWW Source0: http://acidlab.sourceforge.net/%{name}-%{version}.tar.gz # Source0-md5: d8c49614393fa05ac140de349f57e438 +Source1: %{name}.conf Patch0: %{name}-config.patch URL: http://acidlab.sourceforge.net/ # 1.2 is sufficient, but -config is for location used in 3.50+ @@ -37,19 +38,54 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{aciddir},%{_sysconfdir}} +install -d $RPM_BUILD_ROOT{%{aciddir},%{_sysconfdir}} \ + $RPM_BUILD_ROOT%{_sysconfdir}/httpd install acid* index.html $RPM_BUILD_ROOT%{aciddir} mv -f $RPM_BUILD_ROOT%{aciddir}/acid_conf.php $RPM_BUILD_ROOT%{_sysconfdir} ln -sf %{_sysconfdir}/acid_conf.php $RPM_BUILD_ROOT%{aciddir}/acid_conf.php +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf +%{__sed} -e '[EMAIL PROTECTED]@[EMAIL PROTECTED]' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf > \ + $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf.tmp +mv $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf.tmp $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf + %clean rm -rf $RPM_BUILD_ROOT +%post +if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then + echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf + if [ -f /var/lock/subsys/httpd ]; then + /usr/sbin/apachectl restart 1>&2 + fi +elif [ -d /etc/httpd/httpd.conf ]; then + ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf + if [ -f /var/lock/subsys/httpd ]; then + /usr/sbin/apachectl restart 1>&2 + fi +fi + +%preun +if [ "$1" = "0" ]; then + umask 027 + if [ -d /etc/httpd/httpd.conf ]; then + rm -f /etc/httpd/httpd.conf/99_%{name}.conf + else + grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \ + /etc/httpd/httpd.conf.tmp + mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf + fi + if [ -f /var/lock/subsys/httpd ]; then + /usr/sbin/apachectl restart 1>&2 + fi +fi + %files %defattr(644,root,root,755) %doc create* CHANGELOG CREDITS README TODO %{aciddir} +%config(noreplace) %verify(not md5 mtime size) /etc/httpd/%{name}.conf %attr(640,root,http) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/acid_conf.php %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -58,6 +94,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2005/12/03 18:59:36 czarny +- apache conf file +- apache install scripts + Revision 1.15 2005/04/25 10:29:54 misi3k - rel 4 - acid requires php4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/acid.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
