Author: adamg Date: Sat Feb 25 22:49:02 2012 GMT Module: packages Tag: HEAD ---- Log message: - merge -mod_mpm_* into -base
---- Files affected: packages/apache: apache.spec (1.650 -> 1.651) ---- Diffs: ================================================================ Index: packages/apache/apache.spec diff -u packages/apache/apache.spec:1.650 packages/apache/apache.spec:1.651 --- packages/apache/apache.spec:1.650 Sat Feb 25 22:58:51 2012 +++ packages/apache/apache.spec Sat Feb 25 23:48:57 2012 @@ -1624,36 +1624,6 @@ służyć jako "druga linia obrony" dla przypadków, których nie może rozwiązać mod_mime. -%package mod_mpm_event -Summary: A variant of the worker MPM with the goalof consuming threads only for connections with active processing -Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.4/mod/mod_mpm_event.html -Requires: %{name}-base = %{version}-%{release} -Provides: apache(mod_mpm_event) = %{version}-%{release} - -%description mod_mpm_event -A variant of the worker MPM with the goalof consuming threads only for connections with active processing - -%package mod_mpm_prefork -Summary: Implements a non-threaded, pre-forking web server -Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.4/mod/mod_mpm_prefork.html -Requires: %{name}-base = %{version}-%{release} -Provides: apache(mod_mpm_prefork) = %{version}-%{release} - -%description mod_mpm_prefork -Implements a non-threaded, pre-forking web server - -%package mod_mpm_worker -Summary: Multi-Processing Module implementing a hybrid multi-threaded multi-process web server -Group: Networking/Daemons/HTTP -URL: http://httpd.apache.org/docs/2.4/mod/mod_mpm_worker.html -Requires: %{name}-base = %{version}-%{release} -Provides: apache(mod_mpm_worker) = %{version}-%{release} - -%description mod_mpm_worker -Multi-Processing Module implementing a hybrid multi-threaded multi-process web server - %package mod_negotiation Summary: Provides for content negotiation Summary(pl.UTF-8): Moduł do negocjacji treści @@ -2406,9 +2376,6 @@ echo "LoadModule log_debug_module modules/mod_log_debug.so" > $CFG/00_mod_log_debug.conf echo "LoadModule log_forensic_module modules/mod_log_forensic.so" > $CFG/00_mod_log_forensic.conf echo "LoadModule logio_module modules/mod_logio.so" > $CFG/00_mod_logio.conf -echo "LoadModule mpm_event_module modules/mod_mpm_event.so" > $CFG/00_mod_mpm_event.conf -echo "LoadModule mpm_prefork_module modules/mod_mpm_prefork.so" > $CFG/00_mod_mpm_prefork.conf -echo "LoadModule mpm_worker_module modules/mod_mpm_worker.so" > $CFG/00_mod_mpm_worker.conf echo "LoadModule negotiation_module modules/mod_negotiation.so" > $CFG/00_mod_negotiation.conf echo "LoadModule ratelimit_module modules/mod_ratelimit.so" > $CFG/00_mod_ratelimit.conf echo "LoadModule reflector_module modules/mod_reflector.so" > $CFG/00_mod_reflector.conf @@ -2726,9 +2693,6 @@ %module_scripts mod_logio %module_scripts mod_mime %module_scripts mod_mime_magic -%module_scripts mod_mpm_event -%module_scripts mod_mpm_prefork -%module_scripts mod_mpm_worker %module_scripts mod_negotiation %module_scripts mod_proxy %module_scripts mod_ratelimit @@ -2835,6 +2799,9 @@ %dir %{_datadir}/vhosts # do not adapter here, %{_datadir} != /usr/share here %{_datadir}/icons +%attr(755,root,root) %{_libexecdir}/mod_mpm_event.so +%attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so +%attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so %files doc -f manual.files %defattr(644,root,root,755) @@ -3234,21 +3201,6 @@ %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_mime_magic.conf %attr(755,root,root) %{_libexecdir}/mod_mime_magic.so -%files mod_mpm_event -%defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_mpm_event.conf -%attr(755,root,root) %{_libexecdir}/mod_mpm_event.so - -%files mod_mpm_prefork -%defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_mpm_prefork.conf -%attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so - -%files mod_mpm_worker -%defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_mpm_worker.conf -%attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so - %files mod_negotiation %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_negotiation.conf @@ -3436,6 +3388,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.651 2012/02/25 22:48:57 adamg +- merge -mod_mpm_* into -base + Revision 1.650 2012/02/25 21:58:51 adamg - fix URLs in newly added modules ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.650&r2=1.651&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit