- one more typo

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index 4c535af364d9fce98c373e2e95e0c907bb940ecf..5496053ff7e0f70d4f2e5ffea1439774a5f7f0f4 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -26,12 +26,12 @@ Summary(tr):        Lider WWW taray
 Summary(uk):   îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
-Version:       1.3.31
-Release:       5
+Version:       1.3.32
+Release:       1
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
-# Source0-md5: bd548a06ac48dda496b4e613572bb020
+# Source0-md5: 45164531fb57bfa18af4b9efd0850dd3
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       apache-icons.tar.gz
@@ -40,9 +40,11 @@ Source4:     %{name}.sysconfig
 Source5:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2
 # Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e
 Source6:       %{name}-httpd.conf
+Source7:       %{name}.monitrc
 Source8:       %{name}-mod_vhost_alias.conf
 Source9:       %{name}-mod_status.conf
 Source10:      %{name}-mod_proxy.conf
+Source11:      %{name}-mod_autoindex.conf
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-suexec.patch
 Patch2:                %{name}-errordocs.patch
@@ -199,7 +201,7 @@ Internet 
 
 %package suexec
 Summary:       Apache suexec wrapper
-Summary(pl):   Suexec wrapper do serwera www Apache
+Summary(pl):   Suexec wrapper do serwera WWW Apache
 Summary(ru):   Apache suEXEC CGI wrapper
 Summary(uk):   Apache suEXEC CGI wrapper
 Group:         Development/Tools
@@ -299,7 +301,7 @@ Summary(is):        Hausaskr
 Summary(it):   File include per il web server Apache
 Summary(ja):   Apache Web ¥µ¡¼¥Ð¡¼ÍѤγ«È¯¥Ä¡¼¥ë
 Summary(nb):   Headerfiler for webtjeneren Apache
-Summary(pl):   Pliki nag³ówkowe do tworzenai modu³ów rozszerzeñ do serwera www Apache
+Summary(pl):   Pliki nag³ówkowe do tworzenia modu³ów rozszerzeñ do serwera WWW Apache
 Summary(pt):   Ficheiros de inclusão para o servidor Web Apache
 Summary(pt_BR):        Arquivos de inclusão do Apache para desenvolvimento de módulos
 Summary(ru):   æÁÊÌÙ ÚÁÇÏÌÏ×ËÏ× ÄÌÑ web server'Á Apache
@@ -460,6 +462,20 @@ authentication using MD5 Digest Authentication.
 Modu³ ten dostarcza metodê autoryzacji bazuj±c± na MD5 Digest
 Authentication.
 
+%package mod_autoindex
+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:      %{name}(EAPI) = %{version}-%{release}
+
+%description mod_autoindex
+This package contains mod_autoindex module. It provides 
+generation index of files.
+
+%description mod_autoindex -l pl
+Ten pakiet dostarcza modu³ autoindex, który generuje indeks plików.
+
 %package mod_define
 Summary:       Apache module - authentication variables for arbitrary directives
 Summary(pl):   Modu³ apache do definiowania zmiennych
@@ -802,7 +818,7 @@ rm -f src/modules/standard/mod_rewrite.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
        $RPM_BUILD_ROOT%{_datadir}/errordocs \
        $RPM_BUILD_ROOT/var/{log/{apache,archiv/apache},run/apache}
 
@@ -824,6 +840,8 @@ install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.conf
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/mod_proxy.conf
+install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/mod_autoindex.conf
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/monit
 
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
 
@@ -863,7 +881,6 @@ fi
 %{apxs} -e -a -n access %{_libexecdir}/mod_access.so 1>&2
 %{apxs} -e -a -n alias %{_libexecdir}/mod_alias.so 1>&2
 %{apxs} -e -a -n asis %{_libexecdir}/mod_asis.so 1>&2
-%{apxs} -e -a -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
 %{apxs} -e -a -n cern_meta %{_libexecdir}/mod_cern_meta.so 1>&2
 %{apxs} -e -a -n cgi %{_libexecdir}/mod_cgi.so 1>&2
 %{apxs} -e -a -n env %{_libexecdir}/mod_env.so 1>&2
@@ -890,7 +907,6 @@ if [ "$1" = "0" ]; then
        %{apxs} -e -A -n access %{_libexecdir}/mod_access.so 1>&2
        %{apxs} -e -A -n alias %{_libexecdir}/mod_alias.so 1>&2
        %{apxs} -e -A -n asis %{_libexecdir}/mod_asis.so 1>&2
-       %{apxs} -e -A -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
        %{apxs} -e -A -n cern_meta %{_libexecdir}/mod_cern_meta.so 1>&2
        %{apxs} -e -A -n cgi %{_libexecdir}/mod_cgi.so 1>&2
        %{apxs} -e -A -n env %{_libexecdir}/mod_env.so 1>&2
@@ -929,7 +945,6 @@ fi
 %{apxs} -e -a -n access %{_libexecdir}/mod_access.so 1>&2
 %{apxs} -e -a -n alias %{_libexecdir}/mod_alias.so 1>&2
 %{apxs} -e -a -n asis %{_libexecdir}/mod_asis.so 1>&2
-%{apxs} -e -a -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
 %{apxs} -e -a -n cern_meta %{_libexecdir}/mod_cern_meta.so 1>&2
 %{apxs} -e -a -n cgi %{_libexecdir}/mod_cgi.so 1>&2
 %{apxs} -e -a -n env %{_libexecdir}/mod_env.so 1>&2
@@ -944,6 +959,14 @@ fi
 %{apxs} -e -a -n speling %{_libexecdir}/mod_speling.so 1>&2
 %{apxs} -e -a -n userdir %{_libexecdir}/mod_userdir.so 1>&2
 
+%triggerpostun  -- %{name} <= 1.3.31-5
+echo "WARNING!!!"
+echo "Since that version autoindex module has been separated to package %{name}-mod_autoindex"
+echo "If you want to have the same functionality do:"
+echo "poldek --upgrade %{name}-mod_autoindex"
+echo
+
+
 %post mod_actions
 %{apxs} -e -a -n actions %{_libexecdir}/mod_actions.so 1>&2
 if [ -f /var/lock/subsys/apache ]; then
@@ -1023,12 +1046,37 @@ fi
 %triggerpostun mod_auth_db -- apache-mod_auth_db < 2.0.0
 %{apxs} -e -a -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2
 
+%post mod_autoindex
+if [ "$1" = "0" ]; then
+       if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_autoindex.conf" /etc/apache/apache.conf; then
+               echo "Include /etc/apache/mod_autoindex.conf" >> /etc/apache/apache.conf
+       fi
+       %{apxs} -e -a -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
+       fi
+fi
+
+%preun mod_autoindex
+if [ "$1" = "0" ]; then
+       umask 027
+       %{apxs} -e -A -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
+       grep -v "^Include.*mod_autoindex.conf" /etc/apache/apache.conf > \
+               /etc/apache/apache.conf.tmp
+       mv -f /etc/apache/apache.conf.tmp /etc/apache/apache.conf
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
+       fi
+fi
+
 %post mod_auth_digest
-%{apxs} -e -a -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2
-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."
+if [ "$1" = "0" ]; then
+       %{apxs} -e -a -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2
+       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
@@ -1369,13 +1417,13 @@ fi
 %attr(640,root,root) %{_sysconfdir}/magic
 
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
-%attr(640,root,root) %config(noreplace) /etc/logrotate.d/*
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
+%attr(750,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/monit/*.monitrc
 
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/mod_access.so
 %attr(755,root,root) %{_libexecdir}/mod_alias.so
 %attr(755,root,root) %{_libexecdir}/mod_asis.so
-%attr(755,root,root) %{_libexecdir}/mod_autoindex.so
 %attr(755,root,root) %{_libexecdir}/mod_cern_meta.so
 %attr(755,root,root) %{_libexecdir}/mod_cgi.so
 %attr(755,root,root) %{_libexecdir}/mod_env.so
@@ -1399,9 +1447,9 @@ fi
 
 %{_mandir}/man8/apache.8*
 
-%attr(750,root,root) %dir /var/log/apache
-%attr(750,root,root) %dir /var/log/archiv/apache
-%attr(640,root,root) %ghost /var/log/apache/*
+%attr(750,root,logs) %dir /var/log/apache
+%attr(750,root,logs) %dir /var/log/archiv/apache
+%attr(640,root,logs) %ghost /var/log/apache/*
 
 %dir %{_datadir}
 %attr(755,root,root) %dir %{_datadir}/html
@@ -1448,6 +1496,7 @@ fi
 %lang(es) %{_datadir}/html/index.html.es
 %lang(fr) %{_datadir}/html/index.html.fr
 %lang(he) %{_datadir}/html/index.html.he.iso8859-8
+%lang(hu) %{_datadir}/html/index.html.hu
 %lang(it) %{_datadir}/html/index.html.it
 %lang(ja) %{_datadir}/html/index.html.ja.jis
 %lang(ko) %{_datadir}/html/index.html.kr.iso-kr
@@ -1485,10 +1534,6 @@ fi
 %{manualdir}/bind.html.en
 %lang(fr) %{manualdir}/bind.html.fr
 %lang(ja) %{manualdir}/bind.html.ja.jis
-%{manualdir}/cgi_path.html.html
-%{manualdir}/cgi_path.html.en
-%lang(fr) %{manualdir}/cgi_path.html.fr
-%lang(ja) %{manualdir}/cgi_path.html.ja.jis
 %{manualdir}/configuring.html.html
 %{manualdir}/configuring.html.en
 %lang(fr) %{manualdir}/configuring.html.fr
@@ -1503,6 +1548,7 @@ fi
 %{manualdir}/dns-caveats.html.html
 %{manualdir}/dns-caveats.html.en
 %lang(fr) %{manualdir}/dns-caveats.html.fr
+%lang(ja) %{manualdir}/dns-caveats.html.ja.jis
 %{manualdir}/dso.html
 %{manualdir}/env.html.html
 %{manualdir}/env.html.en
@@ -1524,6 +1570,7 @@ fi
 %{manualdir}/invoking.html.html
 %{manualdir}/invoking.html.en
 %lang(fr) %{manualdir}/invoking.html.fr
+%lang(ja) %{manualdir}/invoking.html.ja.jis
 %{manualdir}/keepalive.html.html
 %{manualdir}/keepalive.html.en
 %lang(ja) %{manualdir}/keepalive.html.ja.jis
@@ -1770,6 +1817,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_auth_digest.so
 
+%files mod_autoindex
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mod_autoindex.conf
+%attr(755,root,root) %{_libexecdir}/mod_autoindex.so
+
 %files mod_define
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_define.so
@@ -1831,5 +1883,5 @@ fi
 
 %files mod_vhost_alias
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mod_vhost_alias.conf
+%attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so