Author: glen Date: Wed Feb 16 19:34:51 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- trigger to copy old apache config to new location
---- Files affected:
SPECS:
horde.spec (1.63 -> 1.64)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.63 SPECS/horde.spec:1.64
--- SPECS/horde.spec:1.63 Wed Feb 16 19:51:50 2005
+++ SPECS/horde.spec Wed Feb 16 20:34:45 2005
@@ -9,7 +9,7 @@
Summary(pt_BR): Componentes comuns do Horde usados por todos os módulos
Name: horde
Version: 3.0.3
-Release: 2.5
+Release: 2.6
License: LGPL
Vendor: The Horde Project
Group: Development/Languages/PHP
@@ -43,8 +43,8 @@
%define _sysconfdir /etc/horde.org
%define hordedir /usr/share/horde
-%define _apache1dir /etc/apache
-%define _apache2dir /etc/httpd
+%define _apache1dir /etc/apache/conf.d
+%define _apache2dir /etc/httpd/httpd.conf
%define _php5 %(rpm -q php | awk -F- '{print $2}' |
awk -F. '{print $1}')
%if "%{_php5}" == "5"
@@ -121,15 +121,15 @@
%post
# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
- ln -sf %{_sysconfdir}/apache.conf %{_apache1dir}/conf.d/99_%{name}.conf
+if [ -d %{_apache1dir} ]; then
+ ln -sf %{_sysconfdir}/apache.conf %{_apache1dir}/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}/apache.conf
%{_apache2dir}/httpd.conf/99_%{name}.conf
+if [ -d %{_apache2dir} ]; then
+ ln -sf %{_sysconfdir}/apache.conf %{_apache2dir}/99_%{name}.conf
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
fi
@@ -146,15 +146,15 @@
%preun
if [ "$1" = "0" ]; then
# apache1
- if [ -d %{_apache1dir}/conf.d ]; then
- rm -f %{_apache1dir}/conf.d/99_%{name}.conf
+ if [ -d %{_apache1dir} ]; then
+ rm -f %{_apache1dir}/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 [ -d %{_apache2dir} ]; then
+ rm -f %{_apache2dir}/99_%{name}.conf
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
fi
@@ -182,6 +182,16 @@
' /etc/apache/apache.conf
fi
+if [ -f %{_apache1dir}/horde.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
+ mv -f %{_apache1dir}/horde.conf.rpmsave %{_sysconfdir}/apache.conf
+fi
+
+if [ -f %{_apache2dir}/horde.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
+ mv -f %{_apache2dir}/horde.conf.rpmsave %{_sysconfdir}/apache.conf
+fi
+
if [ -f /var/lock/subsys/apache ]; then
/etc/rc.d/init.d/apache restart 1>&2
fi
@@ -214,6 +224,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.64 2005/02/16 19:34:45 glen
+- trigger to copy old apache config to new location
+
Revision 1.63 2005/02/16 18:51:50 glen
- cleanup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.63&r2=1.64&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
