X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=760cbe6ecb1af99979f135d2a234303026817408;hb=fb7841c81c55058d4480560eb63079033d77176f;hp=685310c4837c13a28a3a22debeebb317b3a0de14;hpb=e07c2df3adf7992e042e2c71966d4dbbb39ec75d;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 685310c..760cbe6 100644
--- a/apache.spec
+++ b/apache.spec
@@ -17,7 +17,6 @@
 # Conditional build:
 %bcond_without	ssl		# build without SSL support
 %bcond_without	ldap		# build without LDAP support
-%bcond_without	metuxmpm	# don't build METUX MPM version
 #
 %include	/usr/lib/rpm/macros.perl
 # this is internal macro, don't change to %%apache_modules_api
@@ -31,17 +30,18 @@ Summary(pt_BR):	Servidor HTTPD para prover servi
 Summary(ru):	óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
-Version:	2.0.50
-Release:	4
+Version:	2.0.52
+Release:	1
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	8b251767212aebf41a13128bb70c0b41
+# Source0-md5:	eba528fa8613dc5bfb0615a69c11f053
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}-icons.tar.gz
 # Source3-md5:	2b085cbc19fd28536dc883f0b864cd83
 Source4:	%{name}.sysconfig
+Source5:	%{name}.monitrc
 Source6:	%{name}-httpd.conf
 Source8:	%{name}-mod_vhost_alias.conf
 Source9:	%{name}-mod_status.conf
@@ -52,6 +52,7 @@ Source13:	%{name}-mod_dav.conf
 Source14:	%{name}-mod_dir.conf
 Source15:	%{name}-mod_suexec.conf
 Source16:	%{name}-mod_deflate.conf
+Source17:	%{name}-mod_autoindex.conf
 Source20:	%{name}-server.crt
 Source21:	%{name}-server.key
 Patch0:		%{name}-configdir_skip_backups.patch
@@ -68,7 +69,6 @@ Patch8:		httpd-2.0.45-encode.patch
 Patch9:		httpd-2.0.45-export.patch
 Patch10:	httpd-2.0.46-dav401dest.patch
 Patch11:	httpd-2.0.46-md5dig.patch
-Patch12:	httpd-2.0.46-shmcb.patch
 Patch13:	httpd-2.0.46-sslmutex.patch
 Patch14:	httpd-2.0.47-sslcleanup.patch
 Patch15:	httpd-2.0.48-corelimit.patch
@@ -78,10 +78,13 @@ Patch18:	httpd-2.0.48-sslpphrase.patch
 Patch19:	%{name}-v6only-ENOPROTOOPT.patch
 Patch20:	%{name}-conffile-path.patch
 Patch21:	%{name}-apxs.patch
+# http://www.telana.com/peruser.php
+Patch22:	httpd-2.0.50-peruser-r3.patch
+Patch23:	%{name}-apr1.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	automake
-BuildRequires:	apr-devel >= 1:0.9.5-6
-BuildRequires:	apr-util-devel >= 1:0.9.5-5
+BuildRequires:	apr-devel >= 1:1.0.0
+BuildRequires:	apr-util-devel >= 1:1.0.0
 BuildRequires:	db-devel
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel >= 1.8.3
@@ -106,14 +109,13 @@ Requires(post,postun):	/sbin/ldconfig
 Requires(post):	fileutils
 Requires:	/etc/mime.types
 Requires:	%{name}-apxs = %{version}-%{release}
-Requires:	apr-util >= 1:0.9.5-5
 Requires:	mailcap
 Requires:	psmisc >= 20.1
 Provides:	apache(modules-api) = %{_apache_modules_api}
 Provides:	group(http)
 Provides:	httpd = %{version}
 Provides:	user(http)
-Provides:	webserver
+Provides:	webserver = apache
 Obsoletes:	apache-extra
 Obsoletes:	apache6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -226,7 +228,7 @@ Summary(pt_BR):	Arquivos de inclus
 Summary(ru):	óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
 Group:		Networking/Utilities
 Requires:	%{name}-apxs = %{version}-%{release}
-Requires:	apr-util-devel >= 1:0.9.5-5
+Requires:	apr-util-devel >= 1:1.0.0
 Requires:	libtool
 Obsoletes:	apache-static
 
@@ -352,6 +354,19 @@ 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:	%{name} = %{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_cache
 Summary:	Content cache keyed to URIs
 Summary(pl):	Pamiêæ podrêczna wg klucza URI
@@ -652,13 +667,12 @@ Modu
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%{?with_metuxmpm:%patch5 -p1}
+%patch5 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
@@ -668,6 +682,10 @@ Modu
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+
+%{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *)
 
 %build
 # sanity check
@@ -682,7 +700,7 @@ fi
 	support/apxs.in
 install /usr/share/automake/config.* build/
 CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
-for mpm in %{?with_metuxmpm:metuxmpm} perchild prefork worker; do
+for mpm in metuxmpm peruser perchild prefork worker; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 ../%configure \
 	--prefix=%{_sysconfdir} \
@@ -746,8 +764,8 @@ install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 	--with-suexec-uidmin=500 \
 	--with-suexec-gidmin=500 \
 	--with-suexec-umask=077 \
-	--with-apr=%{_bindir} \
-	--with-apr-util=%{_bindir}
+	--with-apr=%{_bindir}/apr-1-config \
+	--with-apr-util=%{_bindir}/apu-1-config
 %{__make}
 ./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside
 
@@ -756,7 +774,7 @@ find include -name '*.h' | xargs perl -pi -e "s#/httpd\.(.*?)\.conf#/etc/httpd/h
 cd ..
 done
 
-for mpm in %{?with_metuxmpm:metuxmpm} perchild worker; do
+for mpm in metuxmpm peruser perchild worker; do
 	if ! cmp -s buildmpm-prefork/modules-inside buildmpm-${mpm}/modules-inside; then
 		echo "List of compiled modules is different between prefork-MPM and ${mpm}-MPM!"
 		echo "Build failed."
@@ -766,7 +784,7 @@ done
 
 %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%{_var}/{log/{httpd,archiv/httpd},{run,cache}/apache}
 
 # prefork is default one
@@ -784,7 +802,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 	logdir=%{_var}/log/httpd \
 	proxycachedir=%{_var}/cache/httpd
 
-for mpm in %{?with_metuxmpm:metuxmpm} perchild worker; do
+for mpm in metuxmpm peruser perchild worker; do
 	install buildmpm-${mpm}/httpd.${mpm} $RPM_BUILD_ROOT%{_sbindir}/httpd.${mpm}
 	ln -s httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.${mpm}.conf
 done
@@ -811,6 +829,7 @@ ln -sf %{_libexecdir}/build $RPM_BUILD_ROOT%{_sysconfdir}/build
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
 
@@ -832,6 +851,7 @@ install %{SOURCE13} $CFG/45_mod_dav.conf
 install %{SOURCE14} $CFG/59_mod_dir.conf
 install %{SOURCE15} $CFG/13_mod_suexec.conf
 install %{SOURCE16} $CFG/58_mod_deflate.conf
+install %{SOURCE17} $CFG/57_mod_autoindex.conf
 
 echo "LoadModule ldap_module	%{_libexecdir}/mod_ldap.so" > $CFG/49_mod_ldap.conf
 echo "LoadModule actions_module	%{_libexecdir}/mod_actions.so" > $CFG/50_mod_actions.conf
@@ -902,6 +922,13 @@ if [ "$1" = "0" ]; then
 	%groupremove http
 fi
 
+%triggerpostun  -- %{name} <= 2.0.50-6
+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
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
@@ -958,6 +985,20 @@ if [ "$1" = "0" ]; then
 	fi
 fi
 
+%post mod_autoindex
+if [ -f /var/lock/subsys/httpd ]; then
+	/etc/rc.d/init.d/httpd restart 1>&2
+else
+	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+fi
+
+%preun mod_autoindex
+if [ "$1" = "0" ]; then
+	if [ -f /var/lock/subsys/httpd ]; then
+		/etc/rc.d/init.d/httpd restart 1>&2
+	fi
+fi
+
 %post mod_cache
 if [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
@@ -1237,12 +1278,12 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_httpd.conf
 %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
 
 %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
@@ -1310,8 +1351,8 @@ fi
 %lang(es) %{_datadir}/manual/*.html.es
 %lang(es) %{_datadir}/manual/*.xml.es
 %lang(fr) %{_datadir}/manual/*.html.fr
-%lang(ja) %{_datadir}/manual/*.html.ja.jis
-%lang(ja) %{_datadir}/manual/*.xml.ja
+%lang(ja) %{_datadir}/manual/*.html.ja*
+%lang(ja) %{_datadir}/manual/*.xml.ja*
 %lang(ko) %{_datadir}/manual/*.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/*.xml.ko
 %lang(ru) %{_datadir}/manual/*.html.ru.koi8-r
@@ -1321,7 +1362,7 @@ fi
 %{_datadir}/manual/developer/*.xml
 %{_datadir}/manual/developer/*.xml.meta
 %{_datadir}/manual/developer/*.html.en
-%lang(ja) %{_datadir}/manual/developer/*.html.ja.jis
+%lang(ja) %{_datadir}/manual/developer/*.html.ja*
 %dir %{_datadir}/manual/faq
 %{_datadir}/manual/faq/*.html
 %{_datadir}/manual/faq/*.xml
@@ -1334,8 +1375,8 @@ fi
 %{_datadir}/manual/howto/*.xml
 %{_datadir}/manual/howto/*.xml.meta
 %{_datadir}/manual/howto/*.html.en
-%lang(ja) %{_datadir}/manual/howto/*.html.ja.jis
-%lang(ja) %{_datadir}/manual/howto/*.xml.ja
+%lang(ja) %{_datadir}/manual/howto/*.html.ja*
+%lang(ja) %{_datadir}/manual/howto/*.xml.ja*
 %lang(ko) %{_datadir}/manual/howto/*.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/howto/*.xml.ko
 %dir %{_datadir}/manual/images
@@ -1356,8 +1397,8 @@ fi
 %lang(de) %{_datadir}/manual/mod/[acdilpqtw]*.xml.de
 %lang(es) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.es
 %lang(es) %{_datadir}/manual/mod/[acdilpqtw]*.xml.es
-%lang(ja) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/[acdilpqtw]*.xml.ja
+%lang(ja) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.ja*
+%lang(ja) %{_datadir}/manual/mod/[acdilpqtw]*.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/[acdilpqtw]*.xml.ko
 %lang(ru) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.ru.koi8-r
@@ -1366,8 +1407,8 @@ fi
 %{_datadir}/manual/mod/module-dict.xml
 %{_datadir}/manual/mod/module-dict.xml.meta
 %{_datadir}/manual/mod/module-dict.html.en
-%lang(ja) %{_datadir}/manual/mod/module-dict.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/module-dict.xml.ja
+%lang(ja) %{_datadir}/manual/mod/module-dict.html.ja*
+%lang(ja) %{_datadir}/manual/mod/module-dict.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/module-dict.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/module-dict.xml.ko
 %{_datadir}/manual/mod/mpm_common.html
@@ -1376,34 +1417,34 @@ fi
 %{_datadir}/manual/mod/mpm_common.html.en
 %lang(de) %{_datadir}/manual/mod/mpm_common.html.de
 %lang(de) %{_datadir}/manual/mod/mpm_common.xml.de
-%lang(ja) %{_datadir}/manual/mod/mpm_common.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mpm_common.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mpm_common.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mpm_common.xml.ja*
 %{_datadir}/manual/mod/mod_access.html
 %{_datadir}/manual/mod/mod_access.xml
 %{_datadir}/manual/mod/mod_access.xml.meta
 %{_datadir}/manual/mod/mod_access.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_access.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_access.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_access.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_access.xml.ja*
 %{_datadir}/manual/mod/mod_alias.html
 %{_datadir}/manual/mod/mod_alias.xml
 %{_datadir}/manual/mod/mod_alias.xml.meta
 %{_datadir}/manual/mod/mod_alias.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_alias.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_alias.xml.ja*
 %{_datadir}/manual/mod/mod_asis.html
 %{_datadir}/manual/mod/mod_asis.xml
 %{_datadir}/manual/mod/mod_asis.xml.meta
 %{_datadir}/manual/mod/mod_asis.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_asis.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_asis.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_asis.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_asis.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_asis.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_asis.xml.ko
 %{_datadir}/manual/mod/mod_autoindex.html
 %{_datadir}/manual/mod/mod_autoindex.xml
 %{_datadir}/manual/mod/mod_autoindex.xml.meta
 %{_datadir}/manual/mod/mod_autoindex.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_autoindex.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_autoindex.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_autoindex.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_autoindex.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_autoindex.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_autoindex.xml.ko
 %{_datadir}/manual/mod/mod_cern_meta.html
@@ -1416,24 +1457,24 @@ fi
 %{_datadir}/manual/mod/mod_cgi.xml
 %{_datadir}/manual/mod/mod_cgi.xml.meta
 %{_datadir}/manual/mod/mod_cgi.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_cgi.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_cgi.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_cgi.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_cgi.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_cgi.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_cgi.xml.ko
 %{_datadir}/manual/mod/mod_echo.html
 %{_datadir}/manual/mod/mod_echo.xml
 %{_datadir}/manual/mod/mod_echo.xml.meta
 %{_datadir}/manual/mod/mod_echo.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_echo.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_echo.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_echo.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_echo.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_echo.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_echo.xml.ko
 %{_datadir}/manual/mod/mod_env.html
 %{_datadir}/manual/mod/mod_env.xml
 %{_datadir}/manual/mod/mod_env.xml.meta
 %{_datadir}/manual/mod/mod_env.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_env.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_env.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_env.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_env.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_env.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_env.xml.ko
 %{_datadir}/manual/mod/mod_ext_filter.html
@@ -1446,8 +1487,8 @@ fi
 %{_datadir}/manual/mod/mod_include.xml
 %{_datadir}/manual/mod/mod_include.xml.meta
 %{_datadir}/manual/mod/mod_include.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_include.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_include.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_include.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_include.xml.ja*
 %{_datadir}/manual/mod/mod_log_config.html
 %{_datadir}/manual/mod/mod_log_config.xml
 %{_datadir}/manual/mod/mod_log_config.xml.meta
@@ -1460,36 +1501,36 @@ fi
 %{_datadir}/manual/mod/mod_mime*.xml
 %{_datadir}/manual/mod/mod_mime*.xml.meta
 %{_datadir}/manual/mod/mod_mime*.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_mime*.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_mime*.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_mime*.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_mime*.xml.ja*
 %{_datadir}/manual/mod/mod_negotiation.html
 %{_datadir}/manual/mod/mod_negotiation.xml
 %{_datadir}/manual/mod/mod_negotiation.xml.meta
 %{_datadir}/manual/mod/mod_negotiation.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_negotiation.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_negotiation.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_negotiation.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_negotiation.xml.ja*
 %{_datadir}/manual/mod/mod_setenvif.html
 %{_datadir}/manual/mod/mod_setenvif.xml
 %{_datadir}/manual/mod/mod_setenvif.xml.meta
 %{_datadir}/manual/mod/mod_setenvif.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_setenvif.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_setenvif.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_setenvif.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_setenvif.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_setenvif.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_setenvif.xml.ko
 %{_datadir}/manual/mod/mod_speling.html
 %{_datadir}/manual/mod/mod_speling.xml
 %{_datadir}/manual/mod/mod_speling.xml.meta
 %{_datadir}/manual/mod/mod_speling.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_speling.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_speling.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_speling.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_speling.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_speling.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_speling.xml.ko
 %{_datadir}/manual/mod/mod_userdir.html
 %{_datadir}/manual/mod/mod_userdir.xml
 %{_datadir}/manual/mod/mod_userdir.xml.meta
 %{_datadir}/manual/mod/mod_userdir.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_userdir.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_userdir.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_userdir.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_userdir.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_userdir.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_userdir.xml.ko
 %dir %{_datadir}/manual/programs
@@ -1509,24 +1550,24 @@ fi
 %{_datadir}/manual/mod/mod_suexec.xml
 %{_datadir}/manual/mod/mod_suexec.xml.meta
 %{_datadir}/manual/mod/mod_suexec.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_suexec.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_suexec.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_suexec.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_suexec.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_suexec.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_suexec.xml.ko
 %{_datadir}/manual/mod/mod_actions.html
 %{_datadir}/manual/mod/mod_actions.xml
 %{_datadir}/manual/mod/mod_actions.xml.meta
 %{_datadir}/manual/mod/mod_actions.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_actions.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_actions.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_actions.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_actions.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_actions.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_actions.xml.ko
 %{_datadir}/manual/mod/mod_auth.html
 %{_datadir}/manual/mod/mod_auth.xml
 %{_datadir}/manual/mod/mod_auth.xml.meta
 %{_datadir}/manual/mod/mod_auth.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_auth.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_auth.xml.ja*
 %{_datadir}/manual/mod/mod_auth_anon.html
 %{_datadir}/manual/mod/mod_auth_anon.xml
 %{_datadir}/manual/mod/mod_auth_anon.xml.meta
@@ -1579,24 +1620,24 @@ fi
 %{_datadir}/manual/mod/mod_dav*.xml
 %{_datadir}/manual/mod/mod_dav*.xml.meta
 %{_datadir}/manual/mod/mod_dav*.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_dav*.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_dav*.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_dav*.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_dav*.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_dav*.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_dav*.xml.ko
 %{_datadir}/manual/mod/mod_deflate.html
 %{_datadir}/manual/mod/mod_deflate.xml
 %{_datadir}/manual/mod/mod_deflate.xml.meta
 %{_datadir}/manual/mod/mod_deflate.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_deflate.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_deflate.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_deflate.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_deflate.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_deflate.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_deflate.xml.ko
 %{_datadir}/manual/mod/mod_dir.html
 %{_datadir}/manual/mod/mod_dir.xml
 %{_datadir}/manual/mod/mod_dir.xml.meta
 %{_datadir}/manual/mod/mod_dir.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_dir.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_dir.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_dir.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_dir.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_dir.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_dir.xml.ko
 %{_datadir}/manual/mod/mod_expires.html
@@ -1623,8 +1664,8 @@ fi
 %{_datadir}/manual/mod/mod_info.xml
 %{_datadir}/manual/mod/mod_info.xml.meta
 %{_datadir}/manual/mod/mod_info.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_info.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_info.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_info.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_info.xml.ja*
 %{_datadir}/manual/mod/mod_proxy*.html
 %{_datadir}/manual/mod/mod_proxy*.xml
 %{_datadir}/manual/mod/mod_proxy*.xml.meta
@@ -1641,8 +1682,8 @@ fi
 %{_datadir}/manual/ssl/*.xml
 %{_datadir}/manual/ssl/*.xml.meta
 %{_datadir}/manual/ssl/*.html.en
-%lang(ja) %{_datadir}/manual/ssl/*.html.ja.jis
-%lang(ja) %{_datadir}/manual/ssl/*.xml.ja
+%lang(ja) %{_datadir}/manual/ssl/*.html.ja*
+%lang(ja) %{_datadir}/manual/ssl/*.xml.ja*
 %{_datadir}/manual/mod/mod_ssl.html
 %{_datadir}/manual/mod/mod_ssl.xml
 %{_datadir}/manual/mod/mod_ssl.xml.meta
@@ -1661,8 +1702,8 @@ fi
 %{_datadir}/manual/mod/mod_unique_id.xml
 %{_datadir}/manual/mod/mod_unique_id.xml.meta
 %{_datadir}/manual/mod/mod_unique_id.html.en
-%lang(ja) %{_datadir}/manual/mod/mod_unique_id.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/mod_unique_id.xml.ja
+%lang(ja) %{_datadir}/manual/mod/mod_unique_id.html.ja*
+%lang(ja) %{_datadir}/manual/mod/mod_unique_id.xml.ja*
 %lang(ko) %{_datadir}/manual/mod/mod_unique_id.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/mod/mod_unique_id.xml.ko
 %{_datadir}/manual/mod/mod_vhost_alias.html
@@ -1678,8 +1719,8 @@ fi
 %lang(de) %{_datadir}/manual/vhosts/*.xml.de
 %lang(es) %{_datadir}/manual/vhosts/*.html.es
 %lang(es) %{_datadir}/manual/vhosts/*.xml.es
-%lang(ja) %{_datadir}/manual/vhosts/*.html.ja.jis
-%lang(ja) %{_datadir}/manual/vhosts/*.xml.ja
+%lang(ja) %{_datadir}/manual/vhosts/*.html.ja*
+%lang(ja) %{_datadir}/manual/vhosts/*.xml.ja*
 %lang(ko) %{_datadir}/manual/vhosts/*.html.ko.euc-kr
 %lang(ko) %{_datadir}/manual/vhosts/*.xml.ko
 %lang(ru) %{_datadir}/manual/vhosts/*.html.ru.koi8-r
@@ -1702,8 +1743,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/apxs
 %attr(755,root,root) %{_sbindir}/envvars*
-%attr(750,root,root) %dir %{_sysconfdir}
+%attr(751,root,root) %dir %{_sysconfdir}
 %dir %{_libexecdir}
+%dir %{_libexecdir}/build
+%{_libexecdir}/build/config_vars.mk
 %{_mandir}/man8/apxs.8*
 
 %files devel
@@ -1711,8 +1754,7 @@ fi
 %{_includedir}
 %{_libexecdir}/*.exp
 %attr(750,root,root) %dir %{_sysconfdir}/build
-%attr(755,root,root) %dir %{_libexecdir}/build
-%attr(644,root,root) %{_libexecdir}/build/*.mk
+%{_libexecdir}/build/[lprs]*.mk
 %attr(755,root,root) %{_libexecdir}/build/*.sh
 %attr(755,root,root) %{_libexecdir}/build/libtool
 
@@ -1760,6 +1802,11 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_digest.conf
 %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}/httpd.conf/*_mod_autoindex.conf
+%attr(755,root,root) %{_libexecdir}/mod_autoindex.so
+
 %files mod_cache
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_cache.conf