X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=1d26c4e93dd435ac9b42bd083e4edd6a8e6564dc;hb=a8eff0ee9050c871cfdff99a3747860b4431e7fa;hp=c060465514e00a9a518bdd6b1962bcd538057946;hpb=e57252ef2cd9213707599893f0a5f465899df65f;p=packages%2Fapache.git diff --git a/apache.spec b/apache.spec index c060465..1d26c4e 100644 --- a/apache.spec +++ b/apache.spec @@ -1,6 +1,6 @@ # # Conditional build: -# mod_rewrite_ldap - enable ldap map supoort for mod_rewrite (alpha) +# _with_rewrite_ldap - enable ldap map support for mod_rewrite (alpha) # _without_ipv6 - disable IPv6 support # %include /usr/lib/rpm/macros.perl @@ -26,17 +26,18 @@ Summary(tr): Lider WWW taray Summary(uk): îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server Summary(zh_CN): Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£ Name: apache -Version: 1.3.26 +Version: 1.3.29 Release: 1 -License: Apache Group License +License: Apache Group Group: Networking/Daemons -URL: http://www.apache.org/ -Source0: ftp://ftp.apache.org/dist/%{name}_%{version}.tar.gz -Source1: %{name}.init +Source0: http://www.apache.org/dist/httpd/%{name}_%{version}.tar.gz +# Source0-md5: e97fe9bf51dc2c9c233d53f63b1347e3 +Source1: %{name}1.init Source2: %{name}.logrotate Source3: %{name}-icons.tar.gz Source4: %{name}.sysconfig Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 +# Source5-md5: 74ff6e8d8a7b365b48ed10a52fbeb84e Source6: %{name}-httpd.conf Source8: %{name}-mod_vhost_alias.conf Source9: %{name}-mod_status.conf @@ -63,24 +64,28 @@ Patch18: %{name}-EAPI-missing_files.patch Patch19: %{name}-PLD-nov6.patch Patch20: %{name}-configdir_skip_backups.patch Patch21: %{name}-apxs-quiet.patch -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +URL: http://www.apache.org/ BuildRequires: db3-devel BuildRequires: mm-devel >= 1.1.3 -%{?mod_rewrite_ldap:BuildRequires: openldap-devel} -Provides: httpd -Provides: webserver -Provides: %{name}(EAPI) = %{version} -Prereq: /sbin/chkconfig -Prereq: /usr/sbin/useradd -Prereq: /usr/bin/getgid -Prereq: /bin/id -Prereq: sh-utils -Prereq: rc-scripts -Prereq: mm -Prereq: perl -Requires: mailcap +%{?_with_rewrite_ldap:BuildRequires: openldap-devel} +PreReq: mm +PreReq: perl +PreReq: rc-scripts +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/useradd +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires: /etc/mime.types +Requires: mailcap Requires: psmisc >= 20.1 +Provides: %{name}(EAPI) = %{version} +Provides: httpd +Provides: webserver +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +Obsoletes: httpd +Obsoletes: webserver Obsoletes: apache-extra Obsoletes: apache6 Obsoletes: apache-doc @@ -90,6 +95,7 @@ Obsoletes: indexhtml %define _includedir %{_prefix}/include/apache %define _datadir /home/httpd %define _libexecdir %{_prefix}/lib/apache +%define apxs /usr/sbin/apxs %description Apache is a powerful, full-featured, efficient and freely-available @@ -177,8 +183,6 @@ webbserver. Apache Apache serbest daðýtýlan ve çok kullanýlan yetenekli bir web sunucusudur. -%description -l uk - %description -l zh_CN Apache Êǹ¦ÄÜÇ¿¾¢ÆëÈ«¡¢¸ßЧÇÒÃâ·ÑÌṩµÄ Web ·þÎñ³ÌÐò£¬ ͬʱҲÊÇ Internet ÉÏ×îÁ÷ÐÐµÄ Web ·þÎñ³ÌÐò¡£ @@ -659,7 +663,7 @@ wa %patch10 -p1 %patch11 -p1 %patch12 -p1 -%{?mod_rewrite_ldap:%patch13 -p1} +%{?_with_rewrite_ldap:%patch13 -p1} %patch14 -p1 %patch15 -p1 %patch16 -p1 @@ -670,7 +674,7 @@ wa %patch21 -p1 %build -OPTIM="%{rpmcflags}" \ +OPTIM="%{rpmcflags} -DHARD_SERVER_LIMIT=2048" \ ./configure \ --prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ @@ -701,10 +705,12 @@ OPTIM="%{rpmcflags}" \ %{__make} LIBS1="-lm -lcrypt -lmm -ldl" rm -f src/modules/standard/mod_auth_db.so -%{__make} -C src/modules/standard mod_auth_db.so LIBS_SHLIB="-ldb" +%{__make} -C src/modules/standard mod_auth_db.so \ + LIBS_SHLIB="-ldb" rm -f src/modules/standard/mod_rewrite.so -%{__make} -C src/modules/standard mod_rewrite.so LIBS_SHLIB="-ldb %{?mod_rewrite_ldap:-lldap -llber}" +%{__make} -C src/modules/standard mod_rewrite.so \ + LIBS_SHLIB="-ldb %{?_with_rewrite_ldap:-lldap -llber}" %install rm -rf $RPM_BUILD_ROOT @@ -712,7 +718,8 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT%{_datadir}/errordocs \ $RPM_BUILD_ROOT/var/{log/{httpd,archiv/httpd},run/apache} -%{__make} install-quiet root="$RPM_BUILD_ROOT" +%{__make} install-quiet \ + root="$RPM_BUILD_ROOT" mv -f $RPM_BUILD_ROOT%{_datadir}/html/manual $RPM_BUILD_ROOT%{_datadir} @@ -726,9 +733,8 @@ touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer}_log install errordocs/* $RPM_BUILD_ROOT%{_datadir}/errordocs install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf - -install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/mod_vhost_alias.conf -install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/mod_status.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 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html @@ -739,42 +745,42 @@ rm -rf $RPM_BUILD_ROOT %pre if [ -n "`getgid http`" ]; then if [ "`getgid http`" != "51" ]; then - echo "Warning: group http haven't gid=51. Correct this before installing apache" 1>&2 + echo "Error: group http doesn't have gid=51. Correct this before installing apache." 1>&2 exit 1 fi else - echo "Adding group http GID=51" + echo "Adding group http GID=51." /usr/sbin/groupadd -g 51 -r -f http fi if [ -n "`id -u http 2>/dev/null`" ]; then if [ "`id -u http`" != "51" ]; then - echo "Warning: user http haven't uid=51. Correct this before installing apache" 1>&2 + echo "Error: user http doesn't have uid=51. Correct this before installing apache." 1>&2 exit 1 fi else - echo "Adding user http UID=51" + echo "Adding user http UID=51." /usr/sbin/useradd -u 51 -r -d /home/httpd -s /bin/false -c "HTTP User" -g http http 1>&2 fi %post /sbin/chkconfig --add httpd -%{_sbindir}/apxs -e -a -n access %{_libexecdir}/mod_access.so 1>&2 -%{_sbindir}/apxs -e -a -n alias %{_libexecdir}/mod_alias.so 1>&2 -%{_sbindir}/apxs -e -a -n asis %{_libexecdir}/mod_asis.so 1>&2 -%{_sbindir}/apxs -e -a -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2 -%{_sbindir}/apxs -e -a -n cern_meta %{_libexecdir}/mod_cern_meta.so 1>&2 -%{_sbindir}/apxs -e -a -n cgi %{_libexecdir}/mod_cgi.so 1>&2 -%{_sbindir}/apxs -e -a -n env %{_libexecdir}/mod_env.so 1>&2 -%{_sbindir}/apxs -e -a -n include %{_libexecdir}/mod_include.so 1>&2 -%{_sbindir}/apxs -e -a -n log_agent %{_libexecdir}/mod_log_agent.so 1>&2 -%{_sbindir}/apxs -e -a -n log_config %{_libexecdir}/mod_log_config.so 1>&2 -%{_sbindir}/apxs -e -a -n log_referer %{_libexecdir}/mod_log_referer.so 1>&2 -%{_sbindir}/apxs -e -a -n mime_magic %{_libexecdir}/mod_mime_magic.so 1>&2 -%{_sbindir}/apxs -e -a -n mime %{_libexecdir}/mod_mime.so 1>&2 -%{_sbindir}/apxs -e -a -n negotiation %{_libexecdir}/mod_negotiation.so 1>&2 -%{_sbindir}/apxs -e -a -n setenvif %{_libexecdir}/mod_setenvif.so 1>&2 -%{_sbindir}/apxs -e -a -n speling %{_libexecdir}/mod_speling.so 1>&2 -%{_sbindir}/apxs -e -a -n userdir %{_libexecdir}/mod_userdir.so 1>&2 +%{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 +%{apxs} -e -a -n include %{_libexecdir}/mod_include.so 1>&2 +%{apxs} -e -a -n log_agent %{_libexecdir}/mod_log_agent.so 1>&2 +%{apxs} -e -a -n log_config %{_libexecdir}/mod_log_config.so 1>&2 +%{apxs} -e -a -n log_referer %{_libexecdir}/mod_log_referer.so 1>&2 +%{apxs} -e -a -n mime_magic %{_libexecdir}/mod_mime_magic.so 1>&2 +%{apxs} -e -a -n mime %{_libexecdir}/mod_mime.so 1>&2 +%{apxs} -e -a -n negotiation %{_libexecdir}/mod_negotiation.so 1>&2 +%{apxs} -e -a -n setenvif %{_libexecdir}/mod_setenvif.so 1>&2 +%{apxs} -e -a -n speling %{_libexecdir}/mod_speling.so 1>&2 +%{apxs} -e -a -n userdir %{_libexecdir}/mod_userdir.so 1>&2 umask 137 touch /var/log/httpd/{access,error,agent,referer}_log if [ -f /var/lock/subsys/httpd ]; then @@ -785,23 +791,23 @@ fi %preun if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n access %{_libexecdir}/mod_access.so 1>&2 - %{_sbindir}/apxs -e -A -n alias %{_libexecdir}/mod_alias.so 1>&2 - %{_sbindir}/apxs -e -A -n asis %{_libexecdir}/mod_asis.so 1>&2 - %{_sbindir}/apxs -e -A -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2 - %{_sbindir}/apxs -e -A -n cern_meta %{_libexecdir}/mod_cern_meta.so 1>&2 - %{_sbindir}/apxs -e -A -n cgi %{_libexecdir}/mod_cgi.so 1>&2 - %{_sbindir}/apxs -e -A -n env %{_libexecdir}/mod_env.so 1>&2 - %{_sbindir}/apxs -e -A -n include %{_libexecdir}/mod_include.so 1>&2 - %{_sbindir}/apxs -e -A -n log_agent %{_libexecdir}/mod_log_agent.so 1>&2 - %{_sbindir}/apxs -e -A -n log_config %{_libexecdir}/mod_log_config.so 1>&2 - %{_sbindir}/apxs -e -A -n log_referer %{_libexecdir}/mod_log_referer.so 1>&2 - %{_sbindir}/apxs -e -A -n mime %{_libexecdir}/mod_mime.so 1>&2 - %{_sbindir}/apxs -e -A -n mime_magic %{_libexecdir}/mod_mime_magic.so 1>&2 - %{_sbindir}/apxs -e -A -n negotiation %{_libexecdir}/mod_negotiation.so 1>&2 - %{_sbindir}/apxs -e -A -n setenvif %{_libexecdir}/mod_setenvif.so 1>&2 - %{_sbindir}/apxs -e -A -n speling %{_libexecdir}/mod_speling.so 1>&2 - %{_sbindir}/apxs -e -A -n userdir %{_libexecdir}/mod_userdir.so 1>&2 + %{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 + %{apxs} -e -A -n include %{_libexecdir}/mod_include.so 1>&2 + %{apxs} -e -A -n log_agent %{_libexecdir}/mod_log_agent.so 1>&2 + %{apxs} -e -A -n log_config %{_libexecdir}/mod_log_config.so 1>&2 + %{apxs} -e -A -n log_referer %{_libexecdir}/mod_log_referer.so 1>&2 + %{apxs} -e -A -n mime %{_libexecdir}/mod_mime.so 1>&2 + %{apxs} -e -A -n mime_magic %{_libexecdir}/mod_mime_magic.so 1>&2 + %{apxs} -e -A -n negotiation %{_libexecdir}/mod_negotiation.so 1>&2 + %{apxs} -e -A -n setenvif %{_libexecdir}/mod_setenvif.so 1>&2 + %{apxs} -e -A -n speling %{_libexecdir}/mod_speling.so 1>&2 + %{apxs} -e -A -n userdir %{_libexecdir}/mod_userdir.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd stop 1>&2 fi @@ -810,14 +816,14 @@ fi %postun if [ "$1" = "0" ]; then - echo "Removing user http UID=51" + echo "Removing user http." /usr/sbin/userdel http - echo "Removing group http GID=51" + echo "Removing group http." /usr/sbin/groupdel http fi %post mod_actions -%{_sbindir}/apxs -e -a -n actions %{_libexecdir}/mod_actions.so 1>&2 +%{apxs} -e -a -n actions %{_libexecdir}/mod_actions.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -826,14 +832,14 @@ fi %preun mod_actions if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n actions %{_libexecdir}/mod_actions.so 1>&2 + %{apxs} -e -A -n actions %{_libexecdir}/mod_actions.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_auth -%{_sbindir}/apxs -e -a -n auth %{_libexecdir}/mod_auth.so 1>&2 +%{apxs} -e -a -n auth %{_libexecdir}/mod_auth.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -842,14 +848,14 @@ fi %preun mod_auth if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n auth %{_libexecdir}/mod_auth.so 1>&2 + %{apxs} -e -A -n auth %{_libexecdir}/mod_auth.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_auth_anon -%{_sbindir}/apxs -e -a -n auth_anon %{_libexecdir}/mod_auth_anon.so 1>&2 +%{apxs} -e -a -n auth_anon %{_libexecdir}/mod_auth_anon.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -858,14 +864,14 @@ fi %preun mod_auth_anon if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n auth_anon %{_libexecdir}/mod_auth_anon.so 1>&2 + %{apxs} -e -A -n auth_anon %{_libexecdir}/mod_auth_anon.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_auth_db -%{_sbindir}/apxs -e -a -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2 +%{apxs} -e -a -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -874,14 +880,14 @@ fi %preun mod_auth_db if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2 + %{apxs} -e -A -n auth_db %{_libexecdir}/mod_auth_db.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_auth_digest -%{_sbindir}/apxs -e -a -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2 +%{apxs} -e -a -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -890,17 +896,17 @@ fi %preun mod_auth_digest if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2 + %{apxs} -e -A -n auth_digest %{_libexecdir}/mod_auth_digest.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2 -%{_sbindir}/apxs -e -A -n auth_dbm %{_libexecdir}/mod_auth_dbm.so 1>&2 +%{apxs} -e -A -n auth_dbm %{_libexecdir}/mod_auth_dbm.so 1>&2 %post mod_define -%{_sbindir}/apxs -e -a -n define %{_libexecdir}/mod_define.so 1>&2 +%{apxs} -e -a -n define %{_libexecdir}/mod_define.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -909,14 +915,14 @@ fi %preun mod_define if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n define %{_libexecdir}/mod_define.so 1>&2 + %{apxs} -e -A -n define %{_libexecdir}/mod_define.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_digest -%{_sbindir}/apxs -e -a -n digest %{_libexecdir}/mod_digest.so 1>&2 +%{apxs} -e -a -n digest %{_libexecdir}/mod_digest.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -925,14 +931,14 @@ fi %preun mod_digest if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n digest %{_libexecdir}/mod_digest.so 1>&2 + %{apxs} -e -A -n digest %{_libexecdir}/mod_digest.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_dir -%{_sbindir}/apxs -e -a -n dir %{_libexecdir}/mod_dir.so 1>&2 +%{apxs} -e -a -n dir %{_libexecdir}/mod_dir.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -941,14 +947,14 @@ fi %preun mod_dir if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n dir %{_libexecdir}/mod_dir.so 1>&2 + %{apxs} -e -A -n dir %{_libexecdir}/mod_dir.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_expires -%{_sbindir}/apxs -e -a -n expires %{_libexecdir}/mod_expires.so 1>&2 +%{apxs} -e -a -n expires %{_libexecdir}/mod_expires.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -957,14 +963,14 @@ fi %preun mod_expires if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n expires %{_libexecdir}/mod_expires.so 1>&2 + %{apxs} -e -A -n expires %{_libexecdir}/mod_expires.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_headers -%{_sbindir}/apxs -e -a -n headers %{_libexecdir}/mod_headers.so 1>&2 +%{apxs} -e -a -n headers %{_libexecdir}/mod_headers.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -973,14 +979,14 @@ fi %preun mod_headers if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n headers %{_libexecdir}/mod_headers.so 1>&2 + %{apxs} -e -A -n headers %{_libexecdir}/mod_headers.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_mmap_static -%{_sbindir}/apxs -e -a -n mmap_static %{_libexecdir}/mod_mmap_static.so 1>&2 +%{apxs} -e -a -n mmap_static %{_libexecdir}/mod_mmap_static.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -989,14 +995,14 @@ fi %preun mod_mmap_static if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n mmap_static %{_libexecdir}/mod_mmap_static.so 1>&2 + %{apxs} -e -A -n mmap_static %{_libexecdir}/mod_mmap_static.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_imap -%{_sbindir}/apxs -e -a -n imap %{_libexecdir}/mod_imap.so 1>&2 +%{apxs} -e -a -n imap %{_libexecdir}/mod_imap.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -1005,14 +1011,14 @@ fi %preun mod_imap if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n imap %{_libexecdir}/mod_imap.so 1>&2 + %{apxs} -e -A -n imap %{_libexecdir}/mod_imap.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_info -%{_sbindir}/apxs -e -a -n info %{_libexecdir}/mod_info.so 1>&2 +%{apxs} -e -a -n info %{_libexecdir}/mod_info.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -1021,14 +1027,14 @@ fi %preun mod_info if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n info %{_libexecdir}/mod_info.so 1>&2 + %{apxs} -e -A -n info %{_libexecdir}/mod_info.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_proxy -%{_sbindir}/apxs -e -a -n proxy %{_libexecdir}/libproxy.so 1>&2 +%{apxs} -e -a -n proxy %{_libexecdir}/libproxy.so 1>&2 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf; then echo "Include /etc/httpd/mod_proxy.conf" >> /etc/httpd/httpd.conf fi @@ -1040,7 +1046,7 @@ fi %preun mod_proxy if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n proxy %{_libexecdir}/libproxy.so 1>&2 + %{apxs} -e -A -n proxy %{_libexecdir}/libproxy.so 1>&2 grep -v "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf > \ /etc/httpd/httpd.conf.tmp mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf @@ -1050,7 +1056,7 @@ if [ "$1" = "0" ]; then fi %post mod_rewrite -%{_sbindir}/apxs -e -a -n rewrite %{_libexecdir}/mod_rewrite.so 1>&2 +%{apxs} -e -a -n rewrite %{_libexecdir}/mod_rewrite.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -1059,14 +1065,14 @@ fi %preun mod_rewrite if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n rewrite %{_libexecdir}/mod_rewrite.so 1>&2 + %{apxs} -e -A -n rewrite %{_libexecdir}/mod_rewrite.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_status -%{_sbindir}/apxs -e -a -n status %{_libexecdir}/mod_status.so 1>&2 +%{apxs} -e -a -n status %{_libexecdir}/mod_status.so 1>&2 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_status.conf" /etc/httpd/httpd.conf; then echo "Include /etc/httpd/mod_status.conf" >> /etc/httpd/httpd.conf fi @@ -1078,7 +1084,7 @@ fi %preun mod_status if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n status %{_libexecdir}/mod_status.so 1>&2 + %{apxs} -e -A -n status %{_libexecdir}/mod_status.so 1>&2 grep -v "^Include.*mod_status.conf" /etc/httpd/httpd.conf > \ /etc/httpd/httpd.conf.tmp mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf @@ -1088,7 +1094,7 @@ if [ "$1" = "0" ]; then fi %post mod_usertrack -%{_sbindir}/apxs -e -a -n usertrack %{_libexecdir}/mod_usertrack.so 1>&2 +%{apxs} -e -a -n usertrack %{_libexecdir}/mod_usertrack.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -1097,14 +1103,14 @@ fi %preun mod_usertrack if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n usertrack %{_libexecdir}/mod_usertrack.so 1>&2 + %{apxs} -e -A -n usertrack %{_libexecdir}/mod_usertrack.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_unique_id -%{_sbindir}/apxs -e -a -n unique_id %{_libexecdir}/mod_unique_id.so 1>&2 +%{apxs} -e -a -n unique_id %{_libexecdir}/mod_unique_id.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 else @@ -1113,14 +1119,14 @@ fi %preun mod_unique_id if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n unique_id %{_libexecdir}/mod_unique_id.so 1>&2 + %{apxs} -e -A -n unique_id %{_libexecdir}/mod_unique_id.so 1>&2 if [ -f /var/lock/subsys/httpd ]; then /etc/rc.d/init.d/httpd restart 1>&2 fi fi %post mod_vhost_alias -%{_sbindir}/apxs -e -a -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2 +%{apxs} -e -a -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf; then echo "Include /etc/httpd/mod_vhost_alias.conf" >> /etc/httpd/httpd.conf fi @@ -1132,7 +1138,7 @@ fi %preun mod_vhost_alias if [ "$1" = "0" ]; then - %{_sbindir}/apxs -e -A -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2 + %{apxs} -e -A -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2 grep -v "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf > \ /etc/httpd/httpd.conf.tmp mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf @@ -1174,6 +1180,7 @@ fi %attr(755,root,root) %{_libexecdir}/mod_speling.so %attr(755,root,root) %{_libexecdir}/mod_userdir.so +%attr(755,root,root) %{_bindir}/checkgid %attr(755,root,root) %{_bindir}/htdigest %attr(755,root,root) %{_sbindir}/ab @@ -1183,7 +1190,7 @@ fi %attr(755,root,root) %{_sbindir}/logresolve %attr(755,root,root) %{_sbindir}/rotatelogs -%dir %attr(770,root,http) /var/run/apache +%dir %attr(1773,root,http) /var/run/apache %{_mandir}/man1/htdigest.1* %{_mandir}/man8/* @@ -1220,7 +1227,9 @@ fi %{_datadir}/manual/configuring.html.en %lang(fr) %{_datadir}/manual/configuring.html.fr %lang(ja) %{_datadir}/manual/configuring.html.ja.jis -%{_datadir}/manual/content-negotiation.html +%{_datadir}/manual/content-negotiation.html.html +%{_datadir}/manual/content-negotiation.html.en +%lang(ja) %{_datadir}/manual/content-negotiation.html.ja.jis %{_datadir}/manual/custom-error.html.html %{_datadir}/manual/custom-error.html.en %lang(fr) %{_datadir}/manual/custom-error.html.fr @@ -1281,6 +1290,7 @@ fi %lang(ja) %{_datadir}/manual/howto/cgi.html.ja.jis %{_datadir}/manual/howto/footer.html %{_datadir}/manual/howto/header.html +%{_datadir}/manual/howto/htaccess.html %{_datadir}/manual/howto/ssi.html.html %{_datadir}/manual/howto/ssi.html.en %lang(ja) %{_datadir}/manual/howto/ssi.html.ja.jis @@ -1288,6 +1298,7 @@ fi %{_datadir}/manual/mod/core.html.html %{_datadir}/manual/mod/core.html.en %lang(fr) %{_datadir}/manual/mod/core.html.fr +%lang(ja) %{_datadir}/manual/mod/core.html.ja.jis %{_datadir}/manual/mod/directive-dict.html.html %{_datadir}/manual/mod/directive-dict.html.en %lang(fr) %{_datadir}/manual/mod/directive-dict.html.fr @@ -1310,7 +1321,9 @@ fi %{_datadir}/manual/mod/mod_access.html.html %{_datadir}/manual/mod/mod_access.html.en %lang(ja) %{_datadir}/manual/mod/mod_access.html.ja.jis -%{_datadir}/manual/mod/mod_alias.html +%{_datadir}/manual/mod/mod_alias.html.html +%{_datadir}/manual/mod/mod_alias.html.en +%lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja.jis %{_datadir}/manual/mod/mod_asis.html.html %{_datadir}/manual/mod/mod_asis.html.en %lang(ja) %{_datadir}/manual/mod/mod_asis.html.ja.jis @@ -1324,7 +1337,9 @@ fi %lang(ja) %{_datadir}/manual/mod/mod_env.html.ja.jis %{_datadir}/manual/mod/mod_include.html %{_datadir}/manual/mod/mod_log_agent.html -%{_datadir}/manual/mod/mod_log_config.html +%{_datadir}/manual/mod/mod_log_config.html.html +%{_datadir}/manual/mod/mod_log_config.html.en +%lang(ja) %{_datadir}/manual/mod/mod_log_config.html.ja.jis %{_datadir}/manual/mod/mod_log_referer.html %{_datadir}/manual/mod/mod_mime.html.html %{_datadir}/manual/mod/mod_mime.html.en @@ -1421,14 +1436,16 @@ fi %lang(ru) %{_datadir}/html/index.html.ru.ucs4 %lang(ru) %{_datadir}/html/index.html.ru.utf8 %lang(sv) %{_datadir}/html/index.html.se -%lang(zh_TW) %{_datadir}/html/index.html.zh +%lang(zh_TW) %{_datadir}/html/index.html.zh-tw.big5 %{_datadir}/html/*.gif %{_datadir}/errordocs %dir %{_datadir}/icons %{_datadir}/icons/*.gif +%{_datadir}/icons/*.png %dir %{_datadir}/icons/small %{_datadir}/icons/small/*.gif +%{_datadir}/icons/small/*.png %attr(755,root,root) %{_datadir}/cgi-bin %files suexec @@ -1456,7 +1473,10 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_libexecdir}/mod_auth.so %attr(755,root,root) %{_bindir}/htpasswd -%{_datadir}/manual/mod/mod_auth.html +%{_datadir}/manual/howto/auth.html +%{_datadir}/manual/mod/mod_auth.html.html +%{_datadir}/manual/mod/mod_auth.html.en +%lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja.jis %files mod_auth_anon %defattr(644,root,root,755) @@ -1530,7 +1550,9 @@ fi %files mod_rewrite %defattr(644,root,root,755) %attr(755,root,root) %{_libexecdir}/mod_rewrite.so -%{_datadir}/manual/mod/mod_rewrite.html +%{_datadir}/manual/mod/mod_rewrite.html.html +%{_datadir}/manual/mod/mod_rewrite.html.en +%lang(ja) %{_datadir}/manual/mod/mod_rewrite.html.ja.jis %{_datadir}/manual/images/mod_rewrite* %files mod_status