Author: glen Date: Sun Jun 12 09:02:56 2005 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- fix apache_config_install macro (hardcoded apache confdir path)
---- Files affected:
SOURCES:
rpm.macros (1.158.4.43 -> 1.158.4.44)
SOURCES:
rpm.macros (1.222 -> 1.223)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.43 SOURCES/rpm.macros:1.158.4.44
--- SOURCES/rpm.macros:1.158.4.43 Fri Jun 3 15:36:42 2005
+++ SOURCES/rpm.macros Sun Jun 12 11:02:51 2005
@@ -679,7 +679,7 @@
ln -sf %{-c*}%{!-c:%{_sysconfdir}/apache-%{name}.conf}
%{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf\
fi\
# restart apache if the config symlink is there\
-if [ -L /etc/apache/conf.d/%{-n*}%{!-n:99}_%{name}.conf ]; then\
+if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then\
if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
/etc/rc.d/init.d/%{__apache_svcname %{-v*}} restart 1>&2\
fi\
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.222 SOURCES/rpm.macros:1.223
--- SOURCES/rpm.macros:1.222 Fri Jun 3 15:36:43 2005
+++ SOURCES/rpm.macros Sun Jun 12 11:02:51 2005
@@ -687,7 +687,7 @@
ln -sf %{-c*}%{!-c:%{_sysconfdir}/apache-%{name}.conf}
%{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf\
fi\
# restart apache if the config symlink is there\
-if [ -L /etc/apache/conf.d/%{-n*}%{!-n:99}_%{name}.conf ]; then\
+if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then\
if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
/etc/rc.d/init.d/%{__apache_svcname %{-v*}} restart 1>&2\
fi\
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.43&r2=1.158.4.44&f=u
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.222&r2=1.223&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
