Author: glen Date: Sat Mar 5 16:31:17 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- tabs
---- Files affected:
SPECS:
verliadmin.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/verliadmin.spec
diff -u SPECS/verliadmin.spec:1.14 SPECS/verliadmin.spec:1.15
--- SPECS/verliadmin.spec:1.14 Sat Mar 5 17:30:12 2005
+++ SPECS/verliadmin.spec Sat Mar 5 17:31:12 2005
@@ -49,7 +49,7 @@
ln -sf %{_sysconfdir}/verliadmin/config.php
$RPM_BUILD_ROOT%{_verliadmindir}/config.php
# for apache
-echo "Alias /verliadmin /usr/share/%{name}" >apache-%{name}.conf
+echo "Alias /verliadmin /usr/share/%{name}" > apache-%{name}.conf
install apache-%{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
%clean
@@ -58,35 +58,35 @@
%post
# apache1
if [ -d %{_apache1dir}/conf.d ]; then
- ln -sf %{_sysconfdir}/%{name}/apache-%{name}.conf
%{_apache1dir}/conf.d/99_%{name}.conf
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
- fi
+ ln -sf %{_sysconfdir}/%{name}/apache-%{name}.conf
%{_apache1dir}/conf.d/99_%{name}.conf
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+ fi
fi
# apache2
if [ -d %{_apache2dir}/httpd.conf ]; then
- ln -sf %{_sysconfdir}/%{name}/apache-%{name}.conf
%{_apache2dir}/httpd.conf/99_%{name}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
+ ln -sf %{_sysconfdir}/%{name}/apache-%{name}.conf
%{_apache2dir}/httpd.conf/99_%{name}.conf
+ if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd restart 1>&2
+ fi
fi
%preun
if [ "$1" = "0" ]; then
- # apache1
- if [ -d %{_apache1dir}/conf.d ]; then
- rm -f %{_apache1dir}/conf.d/99_%{name}.conf
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
- fi
- fi
- # apache2
- if [ -d %{_apache2dir}/httpd.conf ]; then
- rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
- fi
+ # apache1
+ if [ -d %{_apache1dir}/conf.d ]; then
+ rm -f %{_apache1dir}/conf.d/99_%{name}.conf
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+ fi
+ fi
+ # apache2
+ if [ -d %{_apache2dir}/httpd.conf ]; then
+ rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf
+ if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd restart 1>&2
+ fi
+ fi
fi
%triggerin -- verliadmin = 0.3_RC1
@@ -106,6 +106,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2005/03/05 16:31:12 glen
+- tabs
+
Revision 1.14 2005/03/05 16:30:12 glen
- umask not needed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/verliadmin.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
