Author: glen Date: Thu Feb 24 21:22:49 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unified apache config location
---- Files affected:
SPECS:
horde.spec (1.72 -> 1.73)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.72 SPECS/horde.spec:1.73
--- SPECS/horde.spec:1.72 Thu Feb 24 21:48:49 2005
+++ SPECS/horde.spec Thu Feb 24 22:22:43 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.23
+Release: 2.24
License: LGPL
Vendor: The Horde Project
Group: Development/Languages/PHP
@@ -42,8 +42,8 @@
%define _noautoreq 'pear(XML/WBXML.*)' 'pear(Horde.*)'
'pear(Text/.*)' 'pear(Net/IMSP.*)'
-%define _sysconfdir /etc/horde.org
%define hordedir /usr/share/horde
+%define _sysconfdir /etc/horde.org
%define _apache1dir /etc/apache
%define _apache2dir /etc/httpd
@@ -117,7 +117,7 @@
> $RPM_BUILD_ROOT/var/log/%{name}/%{name}.log
-install %{SOURCE1}
$RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1}
$RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
ln -fs %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/config
%clean
@@ -126,14 +126,14 @@
%post
# apache1
if [ -d %{_apache1dir}/conf.d ]; then
- ln -sf %{_sysconfdir}/apache.conf %{_apache1dir}/conf.d/99_%{name}.conf
+ ln -sf %{_sysconfdir}/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}/apache.conf
%{_apache2dir}/httpd.conf/99_%{name}.conf
+ ln -sf %{_sysconfdir}/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
@@ -186,7 +186,7 @@
fi
done
-%triggerpostun -- horde <= 3.0.3-2
+%triggerpostun -- horde <= 3.0.3-2.23
# apache1 confdir
if [ -f /etc/apache/apache.conf ]; then
if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
@@ -202,13 +202,19 @@
fi
if [ -f %{_apache1dir}/horde.conf.rpmsave ]; then
- cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
- mv -f %{_apache1dir}/horde.conf.rpmsave %{_sysconfdir}/apache.conf
+ cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
+ mv -f %{_apache1dir}/horde.conf.rpmsave
%{_sysconfdir}/apache-%{name}.conf
fi
if [ -f %{_apache2dir}/horde.conf.rpmsave ]; then
- cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
- mv -f %{_apache2dir}/horde.conf.rpmsave %{_sysconfdir}/apache.conf
+ cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
+ mv -f %{_apache2dir}/horde.conf.rpmsave
%{_sysconfdir}/apache-%{name}.conf
+fi
+
+# unified location
+if [ -f %{_sysconfdir}/apache.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
+ mv -f %{_sysconfdir}/apache.conf.rpmsave
%{_sysconfdir}/apache-%{name}.conf
fi
if [ -f /var/lock/subsys/apache ]; then
@@ -224,7 +230,7 @@
%doc README
docs/{HACKING,CONTRIBUTING,CODING_STANDARDS,CHANGES,INSTALL,scripts}
%dir %{_sysconfdir}
%attr(770,root,http) %dir %{_sysconfdir}/%{name}
-%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.php
%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
@@ -249,6 +255,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.73 2005/02/24 21:22:43 glen
+- unified apache config location
+
Revision 1.72 2005/02/24 20:48:49 glen
- unlink from apache in postun rather in preun
- cosmetics
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.72&r2=1.73&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
