diff --git a/apache2.changes b/apache2.changes index 84b0e32..bf15a2f 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 16 12:29:06 UTC 2014 - pgajdos@suse.com + +- drop (turned off) itk mpm spec file code as mpm-itk is now + provided as a separate module, not via patch + (see http://mpm-itk.sesse.net/ and [bnc#851229]) + ------------------------------------------------------------------- Mon Oct 13 12:34:44 UTC 2014 - pgajdos@suse.com diff --git a/apache2.spec b/apache2.spec index 078367c..ef747a3 100644 --- a/apache2.spec +++ b/apache2.spec @@ -59,8 +59,7 @@ BuildRequires: expat-devel %{!?prefork:%define prefork 1} %{!?worker:%define worker 1} %{!?event:%define event 1} -%{!?itk:%define itk 0} -%define mpms_to_build %(test %prefork = 1 && printf prefork) %(test %worker = 1 && printf worker) %(test %event = 1 && printf event) %(test %itk = 1 && printf itk) +%define mpms_to_build %(test %prefork = 1 && printf prefork) %(test %worker = 1 && printf worker) %(test %event = 1 && printf event) # dir names %define datadir /srv/www %define htdocsdir %{datadir}/htdocs @@ -235,14 +234,6 @@ Group: Productivity/Networking/Web/Servers Provides: %{pname}-MPM Requires: %{name} = %{version} %endif -%if %itk - -%package itk -Summary: Apache 2 "ITK" MPM (Multi-Processing Module) -Group: Productivity/Networking/Web/Servers -Provides: %{pname}-MPM -Requires: %{name} = %{version} -%endif %if %worker %description worker @@ -277,21 +268,6 @@ again until the Keep Alive timeout was reached. This MPM depends on APR's atomic compare-and-swap operations for thread synchronization. -%endif -%if %itk - -%description itk -The "ITK" MPM (Multi-Processing Module) is experimental and NOT officially -endorsed by the Apache Software Foundation, so it may or may not work as -expected. - -Apache2-mpm-itk (just mpm-itk for short) is a MPM for the Apache 2 web server. -mpm-itk allows you to run each of your vhosts under a separate uid and gid -- -in short, the scripts and configuration files for one vhost no longer have to -be readable for all the other vhosts. - -See http://mpm-itk.sesse.net/ - %endif %package devel @@ -952,14 +928,6 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original . %dir %{_libdir}/%{pname}-event %{_libdir}/%{pname}-event/mod_*.so %endif -%if %itk - -%files itk -%defattr(-,root,root) -%{_sbindir}/%{httpd}-itk -%dir %{_libdir}/%{pname}-itk -%{_libdir}/%{pname}-itk/mod_*.so -%endif %files devel -f filelist-devel %defattr(-,root,root) @@ -1026,12 +994,6 @@ exit 0 /usr/share/%{pname}/get_module_list &>/dev/null exit 0 %endif -%if %itk - -%post itk -/usr/share/%{pname}/get_module_list &>/dev/null -exit 0 -%endif # # O/ ._ .__ / ._ _ __|_