Author: glen Date: Wed Dec 14 21:26:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use apache.conf as main config
---- Files affected: SPECS: apache.spec (1.435 -> 1.436) ---- Diffs: ================================================================ Index: SPECS/apache.spec diff -u SPECS/apache.spec:1.435 SPECS/apache.spec:1.436 --- SPECS/apache.spec:1.435 Wed Dec 14 21:35:12 2005 +++ SPECS/apache.spec Wed Dec 14 22:26:48 2005 @@ -40,7 +40,7 @@ Summary(tr): Lider WWW tarayýcý Name: apache Version: 2.2.0 -Release: 0.7 +Release: 0.9 License: Apache Group License Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz @@ -52,6 +52,7 @@ Source4: %{name}.sysconfig Source5: %{name}.monitrc Source6: %{name}-httpd.conf +Source7: %{name}-common.conf Source8: %{name}-mod_vhost_alias.conf Source9: %{name}-mod_status.conf Source10: %{name}-mod_proxy.conf @@ -1131,7 +1132,6 @@ for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} worker %{?with_event:event}; do install buildmpm-${mpm}/httpd.${mpm} $RPM_BUILD_ROOT%{_sbindir}/httpd.${mpm} - ln -s httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.${mpm}.conf done ln -s httpd.prefork $RPM_BUILD_ROOT%{_sbindir}/httpd @@ -1157,9 +1157,12 @@ install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key %endif +install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf + CFG="$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/" +# TODO: split by modules +install %{SOURCE7} $CFG/20_common.conf -install %{SOURCE6} $CFG/10_httpd.conf install %{SOURCE8} $CFG/20_mod_vhost_alias.conf install %{SOURCE9} $CFG/25_mod_status.conf install %{SOURCE10} $CFG/30_mod_proxy.conf @@ -1601,7 +1604,8 @@ %attr(750,root,root) %dir %{_sysconfdir}/webapps.d %attr(750,root,root) %dir %{_sysconfdir}/modules %attr(750,root,root) %dir %{_sysconfdir}/run -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_httpd.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_common.conf %attr(640,root,root) %{_sysconfdir}/magic %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/* @@ -1959,6 +1963,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.436 2005/12/14 21:26:48 glen +- use apache.conf as main config + Revision 1.435 2005/12/14 20:35:12 glen - drop Provides: httpd ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.435&r2=1.436&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
