- rel 3

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index ebda28e9e7846d80320e52f8671228ee82f05106..fb003c5eebd9609834d73b67a7e062e6ed586ad5 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -1,3 +1,5 @@
+# TODO
+# - split *all* modules to subpackages?
 #
 # Conditional build:
 %bcond_with    rewrite_ldap    # enable ldap map support for mod_rewrite (alpha)
@@ -27,7 +29,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.33
-Release:       1.75
+Release:       3
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -109,6 +111,8 @@ Provides:   group(http)
 Provides:      httpd
 Provides:      user(http)
 Provides:      webserver = apache
+Provides:      apache = %{version}-%{release}
+%{?with_ipv6:Provides: apache(ipv6)}
 Obsoletes:     apache < 2.0.0
 Obsoletes:     apache-extra
 Obsoletes:     apache6
@@ -219,7 +223,7 @@ Summary:    Apache suexec wrapper
 Summary(pl):   Suexec wrapper do serwera WWW Apache
 Summary(ru):   Apache suEXEC CGI wrapper
 Summary(uk):   Apache suEXEC CGI wrapper
-Group:         Development/Tools
+Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Obsoletes:     apache-suexec < 2.0.0
 
@@ -329,6 +333,7 @@ Group:              Networking/Utilities
 Requires:      %{name}-apxs = %{version}-%{release}
 Provides:      %{name}(EAPI)-devel = %{version}-%{release}
 Provides:      apache(EAPI)-devel = %{version}-%{release}
+%{?with_ipv6:Provides: apache(ipv6)-devel}
 Obsoletes:     apache-devel < 2.0.0
 
 %description devel
@@ -387,8 +392,8 @@ Paketet apache-devel inneh
 Summary:       Apache module for run CGI whenever a file of a certain type is requested
 Summary(pl):   Modu³ dla apache do uruchamiania skryptów cgi
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_actions = %{version}-%{release}
 Obsoletes:     apache-mod_actions < 2.0.0
 
 %description mod_actions
@@ -404,8 +409,8 @@ Ten modu
 Summary:       Apache module with user authentication using textual files
 Summary(pl):   Modu³ autentykacji u¿ytkownika przy u¿yciu plików tekstowych dla Apache
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_auth = %{version}-%{release}
 Obsoletes:     apache-mod_auth < 2.0.0
 
 %description mod_auth
@@ -420,8 +425,8 @@ u
 Summary:       Apache module with "anonymous" user access authentication
 Summary(pl):   Modu³ apache oferuj±cy anonimow± autoryzacjê u¿ytkownia
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_auth_anon = %{version}-%{release}
 Obsoletes:     apache-mod_auth_anon < 2.0.0
 
 %description mod_auth_anon
@@ -445,9 +450,9 @@ postaci adresu pocztowego u
 Summary:       Apache module with user authentication which uses Berkeley DB files
 Summary(pl):   Modu³ apache z mechanizmem autentykacji u¿ywaj±cym plików Berkeley DB
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
+Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
-Requires:      %{apxs}
+Provides:      apache-mod_auth_db = %{version}-%{release}
 Obsoletes:     apache-mod_auth_db < 2.0.0
 
 %description mod_auth_db
@@ -464,9 +469,9 @@ ale jako plik
 Summary:       Apache user authentication module using MD5 Digest Authentication
 Summary(pl):   Modu³ apache do autoryzacji MD5
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Obsoletes:     %{name}-mod_digest
+Provides:      apache-mod_auth_digest = %{version}-%{release}
 Obsoletes:     apache-mod_auth_digest < 2.0.0
 
 %description mod_auth_digest
@@ -481,7 +486,8 @@ Authentication.
 Summary:       Apache module - display index of files
 Summary(pl):   Modu³ apache do wy¶wietlania indeksu plików
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
+Requires(triggerpostun):       %{apxs}
+Provides:      apache-mod_autoindex = %{version}-%{release}
 Requires:      %{name}(EAPI) = %{version}-%{release}
 
 %description mod_autoindex
@@ -495,8 +501,8 @@ Ten pakiet dostarcza modu
 Summary:       Apache module - authentication variables for arbitrary directives
 Summary(pl):   Modu³ apache do definiowania zmiennych
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_define = %{version}-%{release}
 Obsoletes:     apache-mod_define < 2.0.0
 
 %description mod_define
@@ -510,8 +516,8 @@ Modu
 Summary:       Older version of apache user authentication module using MD5 Digest Authentication
 Summary(pl):   Starsza wersja modu³u apache do autoryzacji MD5
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_digest = %{version}-%{release}
 Obsoletes:     apache-mod_digest < 2.0.0
 
 %description mod_digest
@@ -533,8 +539,8 @@ wersji standardu.
 Summary:       Apache module for "trailing slash" redirects and serving directory index files
 Summary(pl):   Modu³ oferuj±cy przekierowania i serwowanie indeksu katalogu.
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_dir = %{version}-%{release}
 Obsoletes:     apache-mod_dir < 2.0.0
 
 %description mod_dir
@@ -548,8 +554,8 @@ Modu
 Summary:       Apache module which generates Expires HTTP headers
 Summary(pl):   Modu³ generuj±cy nag³ówki HTTP Expires
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_expires = %{version}-%{release}
 Obsoletes:     apache-mod_expires < 2.0.0
 
 %description mod_expires
@@ -567,8 +573,8 @@ wa
 Summary:       Apache module allows for the customization of HTTP response headers
 Summary(pl):   Modu³ pozwalaj±cy na modyfikacjê nag³ówków HTTP
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_headers = %{version}-%{release}
 Obsoletes:     apache-mod_headers < 2.0.0
 
 %description mod_headers
@@ -584,8 +590,8 @@ wysy
 Summary:       Apache module with imap-file handler
 Summary(pl):   Modu³ z obs³ug± imap-file
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_imap = %{version}-%{release}
 Obsoletes:     apache-mod_imap < 2.0.0
 
 %description mod_imap
@@ -600,8 +606,8 @@ Modu
 Summary:       Apache module with comprehensive overview of the server configuration
 Summary(pl):   Modu³ dostarczaj±cy informacji na temat serwera.
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_info = %{version}-%{release}
 Obsoletes:     apache-mod_info < 2.0.0
 
 %description mod_info
@@ -617,8 +623,8 @@ modu
 Summary:       Apache module for forensic logging of the requests
 Summary:       Modu³ Apache'a do logowania ¿±dañ w celu pó¼niejszej analizy
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_log_forensic = %{version}-%{release}
 Obsoletes:     apache-mod_log_forensic < 2.0.0
 
 %description mod_log_forensic
@@ -633,8 +639,8 @@ Logowanie jest wykonywane przed i po przetworzeniu 
 Summary:       Apache module for mmap()ing statically configured list files
 Summary(pl):   Modu³ s³u¿±cy do mmap()owania plików.
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_mmap_static = %{version}-%{release}
 Obsoletes:     apache-mod_mmap_static < 2.0.0
 
 %description mod_mmap_static
@@ -650,11 +656,9 @@ Modu
 Summary:       Apache module with Web proxy
 Summary(pl):   Modu³ dodaj±cy obs³ugê serwera proxy
 Group:         Networking/Daemons
-Requires(post,preun):  %{name}(EAPI) = %{version}-%{release}
-Requires(post,preun):  %{apxs}
-Requires(post,preun):  grep
-Requires(preun):       fileutils
+Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_proxy = %{version}-%{release}
 Obsoletes:     apache-mod_proxy < 2.0.0
 
 %description mod_proxy
@@ -672,8 +676,8 @@ HTTP/1.0.
 Summary:       Apache module with rule-based engine for rewrite requested URLs on the fly
 Summary(pl):   Modu³ do ,,przepisywania'' adresów URL w locie
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_rewrite = %{version}-%{release}
 Obsoletes:     apache-mod_rewrite < 2.0.0
 
 %description mod_rewrite
@@ -687,11 +691,9 @@ Modu
 Summary:       Server status report module for apache
 Summary(pl):   Modu³ dostarczaj±cy informacje statystyczne o serwerze.
 Group:         Networking/Daemons
-Requires(post,preun):  %{name}(EAPI) = %{version}-%{release}
-Requires(post,preun):  %{apxs}
-Requires(post,preun):  grep
-Requires(preun):       fileutils
+Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_status = %{version}-%{release}
 Obsoletes:     apache-mod_status < 2.0.0
 
 %description mod_status
@@ -709,8 +711,8 @@ pracy serwera apache (w postaci strony HTML).
 Summary:       Apache module which provides a magic token for each request
 Summary(pl):   Modu³ nadaj±cy ka¿demu ¿±daniu unikalny token
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_unique_id = %{version}-%{release}
 Obsoletes:     apache-mod_unique_id < 2.0.0
 
 %description mod_unique_id
@@ -732,8 +734,8 @@ UNIQUE_ID.
 Summary:       Apache module for user tracking using cookies
 Summary(pl):   Modu³ s³u¿±cy do ¶ledzenia u¿ytkowników przy u¿yciu ciasteczek
 Group:         Networking/Daemons
-Requires(post,preun):  %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_usertrack = %{version}-%{release}
 Obsoletes:     apache-mod_usertrack < 2.0.0
 
 %description mod_usertrack
@@ -750,11 +752,9 @@ wiele plik
 Summary:       Apache module for dynamically configured mass virtual hosting
 Summary(pl):   Modu³ dodaj±cy obs³ugê hostów wirtualnych.
 Group:         Networking/Daemons
-Requires(post,preun):  %{name}(EAPI) = %{version}-%{release}
-Requires(post,preun):  %{apxs}
-Requires(post,preun):  grep
-Requires(preun):       fileutils
+Requires(triggerpostun):       %{apxs}
 Requires:      %{name}(EAPI) = %{version}-%{release}
+Provides:      apache-mod_vhost_alias = %{version}-%{release}
 Obsoletes:     apache-mod_vhost_alias < 2.0.0
 
 %description mod_vhost_alias
@@ -856,22 +856,31 @@ touch $RPM_BUILD_ROOT/var/log/apache/{access,error,agent,referer}_log
 
 install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs
 
+mv $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf conf/apache.conf.dist
 install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/"
+CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d"
 
 echo "LoadModule access_module      modules/mod_access.so" > $CFG/01_mod_access.conf
-install %{SOURCE8}     $CFG/10_common.conf
-echo "LoadModule asis_module        modules/mod_asis.so" > $CFG/11_mod_asis.conf
-echo "LoadModule cgi_module         modules/mod_cgi.so" > $CFG/12_mod_cgi.conf
-echo "LoadModule env_module         modules/mod_env.so" > $CFG/13_mod_env.conf
-echo "LoadModule include_module     modules/mod_include.so" > $CFG/14_mod_include.conf
-echo "LoadModule log_agent_module   modules/mod_log_agent.so" > $CFG/15_mod_log_agent.conf
-echo "LoadModule log_referer_module modules/mod_log_referer.so" > $CFG/16_mod_log_referer.conf
-echo "LoadModule speling_module     modules/mod_speling.so" > $CFG/17_mod_speling.conf
+install %{SOURCE17}    $CFG/02_mod_alias.conf
+echo "LoadModule asis_module        modules/mod_asis.so" > $CFG/03_mod_asis.conf
+install %{SOURCE21} $CFG/04_mod_cern_meta.conf
+echo "LoadModule cgi_module         modules/mod_cgi.so" > $CFG/05_mod_cgi.conf
+echo "LoadModule env_module         modules/mod_env.so" > $CFG/06_mod_env.conf
+echo "LoadModule include_module     modules/mod_include.so" > $CFG/07_mod_include.conf
+echo "LoadModule log_agent_module   modules/mod_log_agent.so" > $CFG/08_mod_log_agent.conf
+install %{SOURCE14} $CFG/09_mod_log_config.conf
+echo "LoadModule log_referer_module modules/mod_log_referer.so" > $CFG/10_mod_log_referer.conf
+install %{SOURCE16}    $CFG/11_mod_mime_magic.conf
+install %{SOURCE19}    $CFG/12_mod_mime.conf
+install %{SOURCE18} $CFG/13_mod_negotiation.conf
+install %{SOURCE22}    $CFG/14_mod_setenvif.conf
+echo "LoadModule speling_module     modules/mod_speling.so" > $CFG/15_mod_speling.conf
+install %{SOURCE15}    $CFG/16_mod_userdir.conf
+
+install %{SOURCE8}     $CFG/20_common.conf
+
 install %{SOURCE23}    $CFG/20_mod_vhost_alias.conf
-install %{SOURCE19}    $CFG/24_mod_mime.conf
-# mod_status needs mod_mime (SetHandler)
 install %{SOURCE9}     $CFG/25_mod_status.conf
 install %{SOURCE10}    $CFG/30_mod_proxy.conf
 install %{SOURCE20}    $CFG/50_mod_actions.conf
@@ -881,12 +890,6 @@ echo "LoadModule auth_db_module    modules/mod_auth_db.so" > $CFG/53_mod_auth_db.co
 echo "LoadModule auth_digest_module    modules/mod_auth_digest.so" > $CFG/54_mod_auth_digest.conf
 install %{SOURCE11}    $CFG/57_mod_autoindex.conf
 install %{SOURCE12}    $CFG/59_mod_dir.conf
-install %{SOURCE17}    $CFG/60_mod_alias.conf
-install %{SOURCE21} $CFG/61_mod_cern_meta.conf
-install %{SOURCE14} $CFG/62_mod_log_config.conf
-install %{SOURCE18} $CFG/64_mod_negotiation.conf
-install %{SOURCE22}    $CFG/65_mod_setenvif.conf
-install %{SOURCE15}    $CFG/66_mod_userdir.conf
 echo "LoadModule expires_module        modules/mod_expires.so" > $CFG/67_mod_expires.conf
 echo "LoadModule headers_module        modules/mod_headers.so" > $CFG/68_mod_headers.conf
 echo "LoadModule imap_module   modules/mod_imap.so" > $CFG/69_mod_imap.conf
@@ -898,7 +901,6 @@ echo "LoadModule digest_module      modules/mod_digest.so" > $CFG/74_mod_digest.conf
 echo "LoadModule log_forensic_module   modules/mod_log_forensic.so" > $CFG/75_mod_log_forensic.conf
 echo "LoadModule mmap_static_module    modules/mod_mmap_static.so" > $CFG/76_mod_mmap_static.conf
 install %{SOURCE13} $CFG/77_mod_info.conf
-install %{SOURCE16}    $CFG/78_mod_mime_magic.conf
 install %{SOURCE24}    $CFG/80_errordocs.conf
 
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit
@@ -913,6 +915,7 @@ perl -p -i -e 's/^if ...O ne "MSWin32"./if (0)/' $RPM_BUILD_ROOT%{apxs}
 mv $RPM_BUILD_ROOT%{_sysconfdir}/modules/* $RPM_BUILD_ROOT%{_libexecdir}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/modules
 ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
+ln -s /var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -975,7 +978,7 @@ if [ -z "`id -u http 2>/dev/null`" ]; then
 fi
 /sbin/chkconfig --add apache
 
-%triggerpostun -- apache1 < 1.3.33-2
+%triggerpostun -- apache1 < 1.3.33-1.85
 # upgrading from older version
 if [ "$1" = "2" ]; then
        sed -i -e '
@@ -1001,7 +1004,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_actions
+%postun mod_actions
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1015,7 +1018,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_auth
+%postun mod_auth
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1029,7 +1032,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_auth_anon
+%postun mod_auth_anon
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1043,7 +1046,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_auth_db
+%postun mod_auth_db
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1053,40 +1056,40 @@ fi
 %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2
 %{apxs} -e -A -n auth_dbm %{_libexecdir}/mod_auth_dbm.so 1>&2
 
-%post mod_autoindex
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
-
-%preun mod_autoindex
+%post mod_auth_digest
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
+       else
+               echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
        fi
 fi
 
-%triggerpostun mod_autoindex -- apache1-mod_autoindex < 1.3.33-2
-%{apxs} -e -A -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
-sed -i -e '
-       s,^Include.*mod_autoindex.conf,Include %{_sysconfdir}/conf.d/*_mod_autoindex.conf,
-' /etc/apache/apache.conf
-
-%post mod_auth_digest
+%postun mod_auth_digest
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
-       else
-               echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
        fi
 fi
 
-%preun mod_auth_digest
+%post mod_autoindex
+if [ -f /var/lock/subsys/apache ]; then
+       /etc/rc.d/init.d/apache restart 1>&2
+fi
+
+%postun mod_autoindex
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
+%triggerpostun mod_autoindex -- apache1-mod_autoindex < 1.3.33-1.85
+%{apxs} -e -A -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
+sed -i -e '
+       s,^Include.*mod_autoindex.conf,Include %{_sysconfdir}/conf.d/*_mod_autoindex.conf,
+' /etc/apache/apache.conf
+
 %post mod_define
 if [ -f /var/lock/subsys/apache ]; then
        /etc/rc.d/init.d/apache restart 1>&2
@@ -1094,7 +1097,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_define
+%postun mod_define
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1108,7 +1111,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_digest
+%postun mod_digest
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1122,7 +1125,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_dir
+%postun mod_dir
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1136,7 +1139,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_expires
+%postun mod_expires
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1150,7 +1153,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_headers
+%postun mod_headers
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1164,7 +1167,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_imap
+%postun mod_imap
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1178,7 +1181,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_info
+%postun mod_info
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1192,10 +1195,10 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_log_forensic
+%postun mod_log_forensic
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
@@ -1206,7 +1209,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_mmap_static
+%postun mod_mmap_static
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1220,14 +1223,14 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_proxy
+%postun mod_proxy
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
-%triggerpostun mod_proxy -- apache1-mod_proxy < 1.3.33-2
+%triggerpostun mod_proxy -- apache1-mod_proxy < 1.3.33-1.85
 %{apxs} -e -A -n proxy %{_libexecdir}/libproxy.so 1>&2
 sed -i -e '
        s,^Include.*mod_proxy.conf,Include %{_sysconfdir}/conf.d/*_mod_proxy.conf,
@@ -1240,7 +1243,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_rewrite
+%postun mod_rewrite
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1254,14 +1257,14 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_status
+%postun mod_status
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
-%triggerpostun mod_status -- apache1-mod_status < 1.3.33-2
+%triggerpostun mod_status -- apache1-mod_status < 1.3.33-1.85
 %{apxs} -e -A -n status %{_libexecdir}/mod_status.so 1>&2
 sed -i -e '
        s,^Include.*mod_status.conf,Include %{_sysconfdir}/conf.d/*_mod_status.conf,
@@ -1274,7 +1277,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_unique_id
+%postun mod_unique_id
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1288,7 +1291,7 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_usertrack
+%postun mod_usertrack
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -1302,14 +1305,14 @@ else
        echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
 fi
 
-%preun mod_vhost_alias
+%postun mod_vhost_alias
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
-%triggerpostun mod_vhost_alias -- apache1-mod_vhost_alias < 1.3.33-2
+%triggerpostun mod_vhost_alias -- apache1-mod_vhost_alias < 1.3.33-1.85
 %{apxs} -e -A -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2
 sed -i -e '
        s,^Include.*mod_vhost_alias.conf,Include %{_sysconfdir}/conf.d/*_mod_vhost_alias.conf,
@@ -1318,12 +1321,13 @@ sed -i -e '
 %files
 %defattr(644,root,root,755)
 %doc ABOUT_APACHE src/CHANGES README
-%doc conf/mime.types
+%doc conf/mime.types conf/apache.conf.dist
 
 %attr(754,root,root) /etc/rc.d/init.d/apache
 
 %attr(750,root,root) %dir %{_sysconfdir}
 %{_sysconfdir}/modules
+%{_sysconfdir}/logs
 %attr(750,root,root) %dir %{_sysconfdir}/conf.d
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_common.conf