# - mod_ext_filter
# - mod_echo
# - config examples for mod_*
-# - switch from worker to perchild when it will be working in apache
# - check if all modules are (de)registered in %%post/%%postun
-# - find smart way to deregister module if its moved from main package to subpackage (maybe test -f ?)
+# - find smart way to deregister module if its moved from main package
+# to subpackage (maybe test -f ?)
# - add %%post/%%postun to suexec
# - --with-suexec-gidmin=500 or =100 ?
# - --with-suexec-uidmin=500 or =1000 ?
-# - multiple MPM support in subpackages like apache-mpm-worker, apache-mpm-prefork
-# and so on. See SuSE 9 apache rpm for idea how to do this.
+# - subpackages for MPMs
+# - check if all modules (*.so) are exactly the same for different MPMs
+# - install stage fails with distcc (make -jN)
#
# Conditional build:
-%bcond_without ssl # don't build with SSL support
-%bcond_without ldap # don't build with LDAP support
-%bcond_with metuxmpm # use METUX MPM
+%bcond_without ssl # build without SSL support
+%bcond_without ldap # build without LDAP support
+%bcond_with external_pcre # build with external PCRE support (Apache bug #27550)
#
%include /usr/lib/rpm/macros.perl
# this is internal macro, don't change to %%apache_modules_api
Summary(ru): óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ
Summary(tr): Lider WWW tarayýcý
Name: apache
-Version: 2.0.48
-Release: 1
+Version: 2.0.53
+Release: 4
License: Apache Group License
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 466c63bb71b710d20a5c353df8c1a19c
+# Source0-md5: b089bdc7065c3be166bcc516b0d92416
+# Source0-size: 6918995
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}-icons.tar.gz
# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83
+# Source3-size: 46320
Source4: %{name}.sysconfig
+Source5: %{name}.monitrc
Source6: %{name}-httpd.conf
Source8: %{name}-mod_vhost_alias.conf
Source9: %{name}-mod_status.conf
Source12: %{name}-mod_ssl.conf
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
Patch4: %{name}-apr.patch
# project homepage http://www.metux.de/mpm/en/?patpage=index
# http://www.sannes.org/metuxmpm/
-Patch5: httpd-2.0.47-metuxmpm-r7.diff
-Patch6: %{name}-posix_syntax
-Patch7: httpd-2.0.40-xfsz.patch
-Patch8: httpd-2.0.45-davetag.patch
-Patch9: httpd-2.0.45-davfs.patch
-Patch10: httpd-2.0.45-encode.patch
-Patch11: httpd-2.0.45-export.patch
-Patch12: httpd-2.0.45-proxy.patch
-Patch13: httpd-2.0.46-dav401dest.patch
-Patch14: httpd-2.0.46-davbadfrag.patch
-Patch15: httpd-2.0.46-execfail.patch
-Patch16: httpd-2.0.46-graceful.patch
-Patch17: httpd-2.0.46-logtimez.patch
-Patch18: httpd-2.0.46-md5dig.patch
-Patch19: httpd-2.0.46-metharray.patch
-Patch20: httpd-2.0.46-rolog.patch
-Patch21: httpd-2.0.46-shmcb.patch
-Patch22: httpd-2.0.46-sslerr.patch
-Patch23: httpd-2.0.46-sslio.patch
-Patch24: httpd-2.0.46-sslmutex.patch
-Patch25: httpd-2.0.47-ldapshm.patch
-Patch26: httpd-2.0.47-sslcleanup.patch
-Patch27: httpd-2.0.48-abench.patch
-Patch28: httpd-2.0.48-autoindex.patch
-Patch29: httpd-2.0.48-CAN-2003-0020.patch
-Patch30: httpd-2.0.48-corelimit.patch
-Patch31: httpd-2.0.48-debuglog.patch
-Patch32: httpd-2.0.48-dynlimit.patch
-Patch33: httpd-2.0.48-fdsetsize.patch
-Patch34: httpd-2.0.48-include.patch
-Patch35: httpd-2.0.48-proxy11.patch
-Patch36: httpd-2.0.48-sslpphrase.patch
-Patch37: httpd-2.0.48-sslvars.patch
-Patch38: httpd-2.0.48-status.patch
-Patch39: httpd-2.0.48-usertrack.patch
-Patch40: httpd-2.0.48-worker.patch
-Patch41: %{name}-v6only-ENOPROTOOPT.patch
+Patch5: httpd-2.0.48-metuxmpm-r8.patch
+Patch6: httpd-2.0.40-xfsz.patch
+Patch7: httpd-2.0.45-davetag.patch
+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
+Patch13: httpd-2.0.46-sslmutex.patch
+Patch14: httpd-2.0.47-sslcleanup.patch
+Patch15: httpd-2.0.48-corelimit.patch
+Patch16: httpd-2.0.48-debuglog.patch
+Patch17: httpd-2.0.48-dynlimit.patch
+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
+Patch24: %{name}-normalize-path.patch
+# http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre
+Patch25: %{name}2-pcre-patch.diff
+Patch26: %{name}-bug_33382.patch
URL: http://httpd.apache.org/
BuildRequires: automake
-BuildRequires: apr-devel >= 1:0.9.4-1
-BuildRequires: apr-util-devel >= 1:0.9.5-0.3
+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
-BuildRequires: libtool >= 1.5
+BuildRequires: libtool >= 2:1.5
%{?with_ldap:BuildRequires: openldap-devel}
%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d}
%{?with_ssl:BuildRequires: openssl-tools >= 0.9.7d}
-BuildRequires: perl-devel >= 5.004
-BuildRequires: rpm-perlprov >= 4.0.4
+%{?with_external_pcre:BuildRequires: pcre-devel}
+BuildRequires: perl-devel >= 1:5.6
+BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 1.159
BuildRequires: zlib-devel
PreReq: perl-base
PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires(post,postun): /sbin/ldconfig
Requires(post): fileutils
-Requires: apr-util >= 1:0.9.4-1
Requires: /etc/mime.types
+Requires: apr >= 1:1.0.0-2
+Requires: %{name}-apxs = %{version}-%{release}
Requires: mailcap
Requires: psmisc >= 20.1
-Provides: httpd = %{version}
-Provides: webserver = %{version}
Provides: apache(modules-api) = %{_apache_modules_api}
+Provides: apache(mod_access)
+Provides: apache(mod_alias)
+Provides: apache(mod_asis)
+Provides: apache(mod_autoindex)
+Provides: apache(mod_cern_meta)
+Provides: apache(mod_cgi)
+Provides: apache(mod_env)
+Provides: apache(mod_include)
+Provides: apache(mod_log_config)
+Provides: apache(mod_mime)
+Provides: apache(mod_mime_magic)
+Provides: apache(mod_negotiation)
+Provides: apache(mod_setenvif)
+Provides: apache(mod_speling)
+Provides: apache(mod_userdir)
+Provides: group(http)
+Provides: httpd = %{version}
+Provides: user(http)
+Provides: webserver = apache
Obsoletes: apache-extra
-Obsoletes: apache-doc
Obsoletes: apache6
-Obsoletes: apache1
-Obsoletes: indexhtml
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/httpd
%description -l es
El servidor web Apache es el mejor servidor gratuito disponible en el
mundo UNIX hoy. Usa HTTP (HyperText Transfer Protocol) para permitir
-que browsers web vean documentos y sometan datos remotamente. Puede
+que navegadores vean documentos y sometan datos remotamente. Puede
ejecutar varias funciones diferentes, incluyendo funciones de proxy y
caché, y nos ofrece características como monitor de estado, conversión
dinámica de tipo, y otras más.
%description -l pl
Apache jest serwerem WWW (World Wide Web). Instaluj±c ten pakiet
-bêdziesz móg³ prezentowaæ w³asne strony WWW w sieci internet.
+bêdziesz móg³ prezentowaæ w³asne strony WWW w sieci Internet.
%description -l pt_BR
O servidor web Apache é o melhor servidor gratuito disponível no mundo
%package suexec
Summary: Apache suexec wrapper
Summary(pl): Wrapper suexec do serwera WWW Apache
-Group: Development/Tools
+Group: Networking/Daemons
Requires: %{name} = %{version}-%{release}
%description suexec
Summary(pl): Pliki Apache index.html*
Group: Documentation
Requires: %{name} = %{version}-%{release}
+Obsoletes: indexhtml
%description index
Apache index.html* files.
%description index -l pl
-Pliki Apache index.html*.
+Pliki index.html* Apache'a.
%package doc
Summary: Apache manual
%description doc -l pl
Podrêcznik Apache'a.
+%package apxs
+Summary: APache eXtenSion tool
+Summary(pl): Narzêdzie do rozszerzania Apache'a
+Group: Development/Tools
+
+%description apxs
+APache eXtenSion tool.
+
+%description apxs -l pl
+Narzêdzie do rozszerzania Apache'a.
+
%package devel
Summary: Module development tools for the Apache web server
Summary(es): Archivos de inclusión del Apache para desarrollo de módulos
Summary(pt_BR): Arquivos de inclusão do Apache para desenvolvimento de módulos
Summary(ru): óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
Group: Networking/Utilities
-Requires: %{name} = %{version}-%{release}
-Requires: apr-util-devel >= 1:0.9.4
+Requires: %{name}-apxs = %{version}-%{release}
+Requires: apr-util-devel >= 1:1.0.0
Requires: libtool
Obsoletes: apache-static
%description devel -l pl
Pliki nag³ówkowe i inne zasoby niezbêdne przy budowaniu modu³ów DSO
-(Dynamic Shared Objects) dla Apache.
+(Dynamic Shared Objects) dla Apache'a.
%description devel -l ru
óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache.
Summary: Apache module for run CGI whenever a file of a certain type is requested
Summary(pl): Modu³ Apache'a do uruchamiania skryptów CGI
Group: Networking/Daemons
+Provides: apache(mod_actions) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_actions
Summary: Apache module with user authentication using textual files
Summary(pl): Modu³ Apache'a identyfikuj±cy u¿ytkowników na podstawie plików tekstowych
Group: Networking/Daemons
+Provides: apache(mod_auth) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
+Requires: htpasswd
%description mod_auth
This package contains mod_auth module. It provides for user
Summary: Apache module with "anonymous" user access authentication
Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkownika "anonimowego"
Group: Networking/Daemons
+Provides: apache(mod_auth_anon) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_anon
This package contains mod_auth_anon module. It allows "anonymous" user
access to authenticated areas. It does access control in a manner
-similar to anonymous-ftp sites; i.e. have a 'magic' user id
+similar to anonymous FTP sites; i.e. have a 'magic' user id
'anonymous' and the email address as a password. These email addresses
can be logged. Combined with other (database) access control methods,
this allows for effective user tracking and customization according to
Summary: Apache module with LDAP user access authentication
Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP
Group: Networking/Daemons
+Provides: apache(mod_auth_ldap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-mod_ldap = %{version}-%{release}
%description mod_auth_ldap
Apache module with LDAP user access authentication.
%description mod_auth_ldap -l pl
-Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP
+Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP.
%package mod_auth_dbm
Summary: Apache module with user authentication which uses DBM files
Summary(pl): Modu³ Apache'a z mechanizmem identyfikacji korzystaj±cym z plików DBM
Group: Networking/Daemons
Obsoletes: apache-mod_auth_db
+Provides: apache(mod_auth_dbm) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_dbm
Summary(pl): Modu³ Apache'a do autoryzacji MD5
Group: Networking/Daemons
Obsoletes: apache-mod_digest
+Provides: apache(mod_auth_digest) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_digest
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
+Provides: apache(mod_autoindex) = %{version}-%{release}
+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
Group: Networking/Daemons
+Provides: apache(mod_cache) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_cache
Implementacja zgodnej z RFC 2616 pamiêci podrêcznej, która mo¿e byæ
u¿ywana do zapamiêtywania zawarto¶ci lokalnej lub dostêpnej przez
proxy. Do³±czono dwa modu³y pozwalaj±ce magazynowaæ dane w pamiêci
-(g³ównie u¿yteczne przy cacheowaniu lokalnej zawarto¶ci) oraz na dysku
-(u¿ywane do cacheowania proxy).
+(g³ównie u¿yteczne przy cache'owaniu lokalnej zawarto¶ci) oraz na
+dysku (u¿ywane do cache'owania proxy).
%package mod_cgid
Summary: Execution of CGI scripts using an external CGI daemon
Summary(pl): Uruchamianie zewnêtrznych skryptów CGI za pomoc± daemona CGI
Group: Networking/Daemons
+Provides: apache(mod_cgid) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_cgid
Summary: Specify character set translation or recoding
Summary(pl): Translacja lub przekodowywanie znaków
Group: Networking/Daemons
+Provides: apache(mod_charset_lite) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_charset_lite
Summary: Apache module - Distributed Authoring and Versioning
Summary(pl): Modu³ Apache'a - rozproszone autorstwo i wersjonowanie
Group: Networking/Daemons
+Provides: apache(mod_dav) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_dav
Summary: Apache module: Compress content before it is delivered to the client
Summary(pl): Modu³ Apache'a kompresuj±cy dane przed przes³aniem ich do klienta
Group: Networking/Daemons
+Provides: apache(mod_deflate) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-mod_headers = %{version}-%{release}
%description mod_deflate
Compress content before it is delivered to the client.
Summary: Apache module for "trailing slash" redirects and serving directory index files
Summary(pl): Modu³ Apache'a oferuj±cy przekierowania i udostêpnianie informacji o zawarto¶ci katalogu
Group: Networking/Daemons
+Provides: apache(mod_dir) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_dir
Summary: Apache module allows for the customization of HTTP response headers
Summary(pl): Modu³ Apache'a pozwalaj±cy na modyfikacjê nag³ówków HTTP
Group: Networking/Daemons
+Provides: apache(mod_headers) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_headers
replaced or removed.
%description mod_headers -l pl
-Modu³ pozwalaj±cy na ³±czenie, usuwania, zamianê nag³ówków HTTP
+Modu³ pozwalaj±cy na ³±czenie, usuwanie oraz zamianê nag³ówków HTTP
wysy³anych do przegl±darki.
%package mod_imap
Summary: Apache module with imap-file handler
Summary(pl): Modu³ Apache'a z obs³ug± imap-file
Group: Networking/Daemons
+Provides: apache(mod_imap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_imap
Summary: Apache module with comprehensive overview of the server configuration
Summary(pl): Modu³ Apache'a udostêpniaj±cy informacje o serwerze
Group: Networking/Daemons
+Provides: apache(mod_info) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_info
Summary: Apache module to use LDAP connections
Summary(pl): Modu³ Apache'a umo¿liwiaj±cy korzystanie z po³±czeñ LDAP
Group: Networking/Daemons
+Provides: apache(mod_ldap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_ldap
Summary: Apache module with Web proxy
Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê serwera proxy
Group: Networking/Daemons
+Provides: apache(mod_proxy) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_proxy
Summary: Apache module with rule-based engine for rewrite requested URLs on the fly
Summary(pl): Modu³ Apache'a do "przepisywania" adresów URL w locie
Group: Networking/Daemons
+Provides: apache(mod_rewrite) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_rewrite
Summary(ru): íÏÄÕÌØ SSL/TLS ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
Group: Networking/Daemons
Epoch: 1
+Provides: apache(mod_ssl) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_ssl
Summary: Server status report module for Apache
Summary(pl): Modu³ udostêpniaj±cy informacje statystyczne z serwera Apache
Group: Networking/Daemons
+Provides: apache(mod_status) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_status
%description mod_status -l pl
Modu³ pozwala administratorowi na przegl±danie statystyk dotycz±cych
-pracy serwera apache (w postaci strony HTML).
+pracy serwera Apache (w postaci strony HTML).
%package mod_usertrack
Summary: Apache module for user tracking using cookies
Summary(pl): Modu³ Apache'a s³u¿±cy do ¶ledzenia "ciasteczek"
Group: Networking/Daemons
+Provides: apache(mod_usertrack) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_usertrack
Summary: Apache module for dynamically configured mass virtual hosting
Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê hostów wirtualnych
Group: Networking/Daemons
+Provides: apache(mod_vhost_alias) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_vhost_alias
Summary: Apache module which provides a magic token for each request
Summary(pl): Modu³ Apache'a nadaj±cy ka¿demu zapytaniu unikalny token
Group: Networking/Daemons
+Provides: apache(mod_unique_id) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_unique_id
Summary: Apache module which generates Expires HTTP headers
Summary(pl): Modu³ Apache'a generuj±cy nag³ówki HTTP Expires
Group: Networking/Daemons
+Provides: apache(mod_expires) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_expires
Summary(pl): Modu³ Apache'a cache'uj±cy statyczn± listê plików w pamiêci
Group: Networking/Daemons
Obsoletes: apache-mmap_static
+Provides: apache(mod_file_cache) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_file_cache
%description mod_file_cache -l pl
Modu³ cache'uj±cy statyczn± listê plików w pamiêci.
+%package -n htpasswd-%{name}
+Summary: Apache 2 htpasswd utility: manage user files for basic authentication
+Summary(pl): Narzêdzie htpasswd z Apache'a 2 do zarz±dzania plikami uwierzytelnienia basic
+Group: Networking/Utilities
+Provides: htpasswd
+Obsoletes: htpasswd
+
+%description -n htpasswd-%{name}
+htpasswd is used to create and update the flat-files used to store
+usernames and password for basic authentication of HTTP users. This
+package contains htpasswd from Apache 2; this version supports
+plaintext passwords and CRYPT (default), MD5 and SHA1 encryptions.
+
+%description -n htpasswd-%{name} -l pl
+htpasswd s³u¿y do tworzenia i uaktualniania plików tekstowych
+s³u¿±cych do przechowywania nazw u¿ytkowników i hase³ do podstawowego
+uwierzytelnienia u¿ytkowników HTTP. Ten pakiet zawiera htpasswd z
+Apache'a 2; ta wersja obs³uguje has³a zapisane czystym tekstem oraz
+zakodowane algorytmami CRYPT (domy¶lnym), MD5 i SHA1.
+
%prep
%setup -q -n httpd-%{version}
%patch0 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch6 -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
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
+%{?with_external_pcre:%patch25 -p2}
%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
+
+%{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *)
+%{__perl} -pi -e "s@BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in
+%{__perl} -pi -e "s@CLEAN_SUBDIRS.*@CLEAN_SUBDIRS =@g" srclib/Makefile.in
%build
# sanity check
MODULES_API=`awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' include/ap_mmn.h`
if [ "$MODULES_API" != "%_apache_modules_api" ]; then
- echo "Set %%_apache_modules_api to $MODILES_API and rerun."
+ echo "Set %%_apache_modules_api to $MODULES_API and rerun."
exit 1
fi
./buildconf
+rm -rf srclib/apr*
# Before configure; fix location of build dir in generated apxs
%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/apache/build:g" \
support/apxs.in
+%{__perl} -pi -e "s:apr-config:apr-1-config:g" support/apxs.in
+%{__perl} -pi -e "s:apu-config:apu-1-config:g" support/apxs.in
install /usr/share/automake/config.* build/
-CPPFLAGS="-DBIG_SECURITY_HOLE=1"
-%configure \
- --prefix=%{_libexecdir} \
+CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
+for mpm in metuxmpm peruser perchild prefork worker; do
+install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
+../%configure \
+ --prefix=%{_sysconfdir} \
+ --exec-prefix=%{_libexecdir} \
+ --with-installbuilddir=%{_libdir}/apache/build \
--enable-layout=PLD \
--enable-modules=all \
--enable-mods-shared=all \
--enable-speling \
--enable-rewrite \
--enable-so \
-%if %{with metuxmpm}
- --with-mpm=metuxmpm \
-%else
- --with-mpm=worker \
+ --with-program-name=httpd.${mpm} \
+ --with-mpm=${mpm} \
+%ifarch %{ix86}
+%ifnarch i386 i486
+ $( [ "${mpm}" = "leader" ] && echo "--enable-nonportable-atomics=yes" ) \
+%endif
%endif
--with-suexec-bin=%{_sbindir}/suexec \
--with-suexec-caller=http \
--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 \
+ %{?with_external_pcre:--with-external-pcre}
%{__make}
+./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside
+
+find include -name '*.h' | xargs perl -pi -e "s#/httpd\.(.*?)\.conf#/etc/httpd/httpd.conf#"
+
+cd ..
+done
+
+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."
+ exit 1
+ fi
+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}
-%{__make} install \
+# prefork is default one
+%{__make} -C buildmpm-prefork install \
DESTDIR=$RPM_BUILD_ROOT \
installbuilddir=%{_sysconfdir}/build \
prefix=%{_sysconfdir}/httpd \
logdir=%{_var}/log/httpd \
proxycachedir=%{_var}/cache/httpd
+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
+
+ln -s httpd.prefork $RPM_BUILD_ROOT%{_sbindir}/httpd
+
+ln -s %{_libdir}/apache $RPM_BUILD_ROOT%{_sysconfdir}/modules
+ln -s %{_localstatedir}/run/apache $RPM_BUILD_ROOT%{_sysconfdir}/run
+ln -s %{_libdir}/apache/build $RPM_BUILD_ROOT%{_sysconfdir}/build
+
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
mv -f $RPM_BUILD_ROOT%{_sysconfdir}/build \
$RPM_BUILD_ROOT%{_libexecdir}/build
-perl -pi -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_libexecdir}/build/*
-perl -pi -e "s#$RPM_BUILD_DIR#%{_usrsrc}#g" $RPM_BUILD_ROOT%{_libexecdir}/build/*
-perl -pi -e "s#-pthread#-lpthread#g" $RPM_BUILD_ROOT%{_libdir}/lib*.la
-perl -pi -e 's#/etc/httpd/build#%{_libexecdir}/build#g' $RPM_BUILD_ROOT%{_libexecdir}/build/*
+%{__perl} -pi -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_libexecdir}/build/*
+%{__perl} -pi -e "s#$RPM_BUILD_DIR#%{_usrsrc}#g" $RPM_BUILD_ROOT%{_libexecdir}/build/*
+%{__perl} -pi -e "s#-pthread#-lpthread#g" $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__perl} -pi -e 's#/etc/httpd/build#%{_libexecdir}/build#g' $RPM_BUILD_ROOT%{_libexecdir}/build/*
ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_libexecdir}/build/libtool
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
install %{SOURCE12} $CFG/40_mod_ssl.conf
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
LoadModule disk_cache_module %{_libexecdir}/mod_disk_cache.so" > $CFG/55_mod_cache.conf
echo "LoadModule cgid_module %{_libexecdir}/mod_cgid.so" > $CFG/56_mod_cgid.conf
echo "LoadModule charset_lite_module %{_libexecdir}/mod_charset_lite.so" > $CFG/57_mod_charset_lite.conf
-echo "LoadModule deflate_module %{_libexecdir}/mod_deflate.so" > $CFG/58_mod_deflate.conf
echo "LoadModule auth_ldap_module %{_libexecdir}/mod_auth_ldap.so" > $CFG/59_mod_auth_ldap.conf
echo "LoadModule expires_module %{_libexecdir}/mod_expires.so" > $CFG/60_mod_expires.conf
echo "LoadModule file_cache_module %{_libexecdir}/mod_file_cache.so" > $CFG/61_mod_file_cache.conf
echo "LoadModule unique_id_module %{_libexecdir}/mod_unique_id.so" > $CFG/66_mod_unique_id.conf
ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
+# let's remove trash (yes, *.html without lang suffix also contain trash)
+find $RPM_BUILD_ROOT%{_datadir}/manual -type f \
+ -name '*.xml' -o -name '*.xml.*' -o -name '*.html' \
+ | xargs rm -f
+
+# htpasswd goes to %{_bindir}
+mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir}/
+ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}/
%clean
rm -rf $RPM_BUILD_ROOT
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun
%postun
/sbin/ldconfig
if [ "$1" = "0" ]; then
- /usr/sbin/userdel http
- /usr/sbin/groupdel http
+ %userremove http
+ %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
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_actions
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth_anon
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth_dbm
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
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_cache
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_cgid
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_charset_lite
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_dav
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth_digest
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_deflate
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_dir
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_expires
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_file_cache
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_headers
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_imap
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_info
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_proxy
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_rewrite
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_ssl
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_status
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_usertrack
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_unique_id
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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_vhost_alias
%attr(754,root,root) /etc/rc.d/init.d/httpd
-%attr(750,root,root) %dir %{_sysconfdir}
%attr(750,root,root) %dir %{_sysconfdir}/httpd.conf
+%attr(750,root,root) %dir %{_sysconfdir}/modules
+%attr(750,root,root) %dir %{_sysconfdir}/run
%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
-%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
%attr(755,root,root) %{_libexecdir}/mod_include.so
%attr(755,root,root) %{_libexecdir}/mod_log_config.so
+%attr(755,root,root) %{_libexecdir}/mod_log_forensic.so
%attr(755,root,root) %{_libexecdir}/mod_mime.so
%attr(755,root,root) %{_libexecdir}/mod_mime_magic.so
%attr(755,root,root) %{_libexecdir}/mod_negotiation.so
%attr(755,root,root) %{_sbindir}/ab
%attr(755,root,root) %{_sbindir}/apachectl
-%attr(755,root,root) %{_sbindir}/apxs
%attr(755,root,root) %{_sbindir}/checkgid
%attr(755,root,root) %{_sbindir}/httpd
+%attr(755,root,root) %{_sbindir}/httpd.*
%attr(755,root,root) %{_sbindir}/logresolve
%attr(755,root,root) %{_sbindir}/rotatelogs
-%attr(755,root,root) %{_sbindir}/envvars*
%dir %attr(770,root,http) /var/run/apache
+%dir %attr(770,root,http) /var/cache/apache
%{_mandir}/man1/htdigest.1*
-%{_mandir}/man8/*
+%{_mandir}/man8/ab.8*
+%{_mandir}/man8/apachectl.8*
+%{_mandir}/man8/httpd.8*
+%{_mandir}/man8/logresolve.8*
+%{_mandir}/man8/rotatelogs.8*
-%attr(750,root,root) %dir /var/log/httpd
-%attr(750,root,root) %dir /var/log/archiv/httpd
-%attr(640,root,root) %ghost /var/log/httpd/*
+%attr(750,root,logs) %dir /var/log/httpd
+%attr(750,root,logs) %dir /var/log/archiv/httpd
+%attr(640,root,logs) %ghost /var/log/httpd/*
%dir %{_datadir}
%attr(755,root,root) %{_datadir}/cgi-bin
%{_datadir}/error
-%dir %{_datadir}/manual
%files doc
+%defattr(644,root,root,755)
+%dir %{_datadir}/manual
%{_datadir}/manual/LICENSE
-%{_datadir}/manual/*.xml
%{_datadir}/manual/*.html.en
-%lang(ja) %{_datadir}/manual/*.html.ja.jis
-%lang(ja) %{_datadir}/manual/*.xml.ja
-%lang(ko) %{_datadir}/manual/*.html.ko.euc-kr
%lang(de) %{_datadir}/manual/*.html.de
+%lang(es) %{_datadir}/manual/*.html.es
%lang(fr) %{_datadir}/manual/*.html.fr
-%{_datadir}/manual/developer
-%{_datadir}/manual/faq
+%lang(ja) %{_datadir}/manual/*.html.ja*
+%lang(ko) %{_datadir}/manual/*.html.ko.euc-kr
+%lang(ru) %{_datadir}/manual/*.html.ru.koi8-r
+%dir %{_datadir}/manual/developer
+%{_datadir}/manual/developer/*.html.en
+%lang(ja) %{_datadir}/manual/developer/*.html.ja*
+%dir %{_datadir}/manual/faq
+%{_datadir}/manual/faq/*.html.en
+%lang(ko) %{_datadir}/manual/faq/*.html.ko.euc-kr
%dir %{_datadir}/manual/howto
-%doc %{_datadir}/manual/howto/*.en
-%lang(ja) %{_datadir}/manual/howto/*.ja.jis
+%{_datadir}/manual/howto/*.html.en
+%lang(ja) %{_datadir}/manual/howto/*.html.ja*
+%lang(ko) %{_datadir}/manual/howto/*.html.ko.euc-kr
%dir %{_datadir}/manual/images
-%{_datadir}/manual/images/[achips]*
-%{_datadir}/manual/misc
+%{_datadir}/manual/images/[!m]*
+%dir %{_datadir}/manual/misc
+%{_datadir}/manual/misc/*.html.en
+%lang(ko) %{_datadir}/manual/misc/*.html.ko.euc-kr
%dir %{_datadir}/manual/mod
-%{_datadir}/manual/mod/[cdfhipw]*.html.en
-%{_datadir}/manual/mod/[acd]*.xml
-%lang(ja) %{_datadir}/manual/mod/[ad]*.xml.ja*
-%lang(ja) %{_datadir}/manual/mod/index.html.ja.jis
-%lang(ja) %{_datadir}/manual/mod/index.xml.ja
-%{_datadir}/manual/mod/index.xml
-%{_datadir}/manual/mod/mpm*.html.en
+%{_datadir}/manual/mod/[cdfhilpqtw]*.html.en
+%lang(de) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.de
+%lang(es) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.es
+%lang(ja) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.ja*
+%lang(ko) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.ko.euc-kr
+%lang(ru) %{_datadir}/manual/mod/[cdfhilpqtw]*.html.ru.koi8-r
+%{_datadir}/manual/mod/module-dict.html.en
+%lang(ja) %{_datadir}/manual/mod/module-dict.html.ja*
+%lang(ko) %{_datadir}/manual/mod/module-dict.html.ko.euc-kr
+%{_datadir}/manual/mod/mpm_common.html.en
+%lang(de) %{_datadir}/manual/mod/mpm_common.html.de
+%lang(ja) %{_datadir}/manual/mod/mpm_common.html.ja*
%{_datadir}/manual/mod/mod_access.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_access.html.ja*
%{_datadir}/manual/mod/mod_alias.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja*
%{_datadir}/manual/mod/mod_asis.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_asis.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_asis.html.ko.euc-kr
%{_datadir}/manual/mod/mod_autoindex.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_autoindex.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_autoindex.html.ko.euc-kr
%{_datadir}/manual/mod/mod_cern_meta.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_cern_meta.html.ko.euc-kr
%{_datadir}/manual/mod/mod_cgi.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_cgi.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_cgi.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_echo.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_echo.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_echo.html.ko.euc-kr
%{_datadir}/manual/mod/mod_env.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_env.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_env.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_ext_filter.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_ext_filter.html.ko.euc-kr
%{_datadir}/manual/mod/mod_include.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_include.html.ja*
%{_datadir}/manual/mod/mod_log_config.html.en
+%{_datadir}/manual/mod/mod_log_forensic.html.en
%{_datadir}/manual/mod/mod_mime*.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_mime*.html.ja*
%{_datadir}/manual/mod/mod_negotiation.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_negotiation.html.ja*
%{_datadir}/manual/mod/mod_setenvif.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_setenvif.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_setenvif.html.ko.euc-kr
%{_datadir}/manual/mod/mod_speling.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_speling.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_speling.html.ko.euc-kr
%{_datadir}/manual/mod/mod_userdir.html.en
-%{_datadir}/manual/platform
-%{_datadir}/manual/programs
-%dir %{_datadir}/manual/search
-%doc %attr(755,root,root) %{_datadir}/manual/search/manual-index.cgi
-%{_datadir}/manual/style
+%lang(ja) %{_datadir}/manual/mod/mod_userdir.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_userdir.html.ko.euc-kr
+%dir %{_datadir}/manual/programs
+%{_datadir}/manual/programs/*.html.en
+%lang(es) %{_datadir}/manual/programs/*.html.es
+%lang(ko) %{_datadir}/manual/programs/*.html.ko.euc-kr
+%lang(ru) %{_datadir}/manual/programs/*.html.ru.koi8-r
+%dir %{_datadir}/manual/style
+%{_datadir}/manual/style/css
+
+%{_datadir}/manual/mod/mod_suexec.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_suexec.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_suexec.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_actions.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_actions.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_actions.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_auth.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_auth.html.ja*
+%{_datadir}/manual/mod/mod_auth_anon.html.en
+%{_datadir}/manual/mod/mod_auth_ldap.html.en
+%{_datadir}/manual/mod/mod_ldap.html.en
+%{_datadir}/manual/mod/mod_auth_dbm.html.en
+%{_datadir}/manual/mod/mod_auth_digest.html.en
+%{_datadir}/manual/mod/mod_cache.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_cache.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_disk_cache.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_disk_cache.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_mem_cache.html.en
+%{_datadir}/manual/mod/mod_cgid.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_cgid.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_charset_lite.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_charset_lite.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_dav*.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_dav*.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_dav*.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_deflate.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_deflate.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_deflate.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_dir.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_dir.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_dir.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_expires.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_expires.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_file_cache.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_file_cache.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_headers.html.en
+%{_datadir}/manual/mod/mod_imap.html.en
+%{_datadir}/manual/mod/mod_info.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_info.html.ja*
+%{_datadir}/manual/mod/mod_proxy*.html.en
+%{_datadir}/manual/mod/mod_rewrite.html.en
+%{_datadir}/manual/images/mod_rewrite*
+%dir %{_datadir}/manual/ssl
+%{_datadir}/manual/ssl/*.html.en
+%lang(ja) %{_datadir}/manual/ssl/*.html.ja*
+%{_datadir}/manual/mod/mod_ssl.html.en
+%{_datadir}/manual/mod/mod_status.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_status.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_usertrack.html.en
+%{_datadir}/manual/mod/mod_unique_id.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_unique_id.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_unique_id.html.ko.euc-kr
+%{_datadir}/manual/mod/mod_vhost_alias.html.en
+%dir %{_datadir}/manual/vhosts
+%{_datadir}/manual/vhosts/*.html.en
+%lang(de) %{_datadir}/manual/vhosts/*.html.de
+%lang(es) %{_datadir}/manual/vhosts/*.html.es
+%lang(ja) %{_datadir}/manual/vhosts/*.html.ja*
+%lang(ko) %{_datadir}/manual/vhosts/*.html.ko.euc-kr
+%lang(ru) %{_datadir}/manual/vhosts/*.html.ru.koi8-r
%files suexec
%defattr(644,root,root,755)
%attr(4755,root,root) %{_sbindir}/suexec
%attr(755,root,root) %{_libexecdir}/mod_suexec.so
-%{_datadir}/manual/mod/mod_suexec.html.en
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_suexec.conf
+%{_mandir}/man8/suexec.8*
%files index
%defattr(644,root,root,755)
%{_datadir}/html/*.gif
%{_datadir}/html/*.png
+%files apxs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/apxs
+%attr(755,root,root) %{_sbindir}/envvars*
+%attr(751,root,root) %dir %{_sysconfdir}
+%dir %{_libexecdir}
+%dir %{_libexecdir}/build
+%{_libexecdir}/build/config_vars.mk
+%{_mandir}/man8/apxs.8*
+
%files devel
%defattr(644,root,root,755)
%{_includedir}
%{_libexecdir}/*.exp
-%attr(755,root,root) %dir %{_libexecdir}/build
-%attr(644,root,root) %{_libexecdir}/build/*.mk
+%attr(750,root,root) %dir %{_sysconfdir}/build
+%{_libexecdir}/build/[lprs]*.mk
%attr(755,root,root) %{_libexecdir}/build/*.sh
%attr(755,root,root) %{_libexecdir}/build/libtool
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_actions.conf
%attr(755,root,root) %{_libexecdir}/mod_actions.so
-%{_datadir}/manual/mod/mod_actions.html.en
%files mod_auth
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth.conf
%attr(755,root,root) %{_libexecdir}/mod_auth.so
-%attr(755,root,root) %{_sbindir}/htpasswd
-%{_datadir}/manual/mod/mod_auth.html.en
-%{_mandir}/man1/htpasswd.1*
%files mod_auth_anon
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_anon.conf
%attr(755,root,root) %{_libexecdir}/mod_auth_anon.so
-%{_datadir}/manual/mod/mod_auth_anon.html.en
%if %{with ldap}
%files mod_auth_ldap
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_ldap.conf
%attr(755,root,root) %{_libexecdir}/mod_auth_ldap.so
-%{_datadir}/manual/mod/mod_auth_ldap.html.en
%endif
%if %{with ldap}
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_ldap.conf
%attr(755,root,root) %{_libexecdir}/mod_ldap.so
-%{_datadir}/manual/mod/mod_ldap.html.en
%endif
%files mod_auth_dbm
%attr(755,root,root) %{_libexecdir}/mod_auth_dbm.so
%attr(755,root,root) %{_sbindir}/dbmmanage
%attr(755,root,root) %{_sbindir}/htdbm
-%{_datadir}/manual/mod/mod_auth_dbm.html.en
%{_mandir}/man1/dbmmanage.1*
%files mod_auth_digest
%defattr(644,root,root,755)
%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
-%{_datadir}/manual/mod/mod_auth_digest.html.en
+
+%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(755,root,root) %{_libexecdir}/mod_cache.so
%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so
%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so
-%{_datadir}/manual/mod/mod_cache.html.en
%files mod_cgid
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_cgid.conf
%attr(755,root,root) %{_libexecdir}/mod_cgid.so
-%{_datadir}/manual/mod/mod_cgid.html.en
%files mod_charset_lite
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_charset_lite.conf
%attr(755,root,root) %{_libexecdir}/mod_charset_lite.so
-%{_datadir}/manual/mod/mod_charset_lite.html.en
%files mod_dav
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_dav.conf
%attr(755,root,root) %{_libexecdir}/mod_dav*.so
-%{_datadir}/manual/mod/mod_dav*.html.en
%files mod_deflate
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_deflate.conf
%attr(755,root,root) %{_libexecdir}/mod_deflate.so
-%{_datadir}/manual/mod/mod_deflate.html.en
%files mod_dir
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_dir.conf
%attr(755,root,root) %{_libexecdir}/mod_dir.so
-%{_datadir}/manual/mod/mod_dir.html.en
%files mod_expires
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_expires.conf
%attr(755,root,root) %{_libexecdir}/mod_expires.so
-%{_datadir}/manual/mod/mod_expires.html.en
%files mod_file_cache
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_file_cache.conf
%attr(755,root,root) %{_libexecdir}/mod_file_cache.so
-%{_datadir}/manual/mod/mod_file_cache.html.en
%files mod_headers
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_headers.conf
%attr(755,root,root) %{_libexecdir}/mod_headers.so
-%{_datadir}/manual/mod/mod_headers.html.en
%files mod_imap
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_imap.conf
%attr(755,root,root) %{_libexecdir}/mod_imap.so
-%{_datadir}/manual/mod/mod_imap.html.en
%files mod_info
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_info.conf
%attr(755,root,root) %{_libexecdir}/mod_info.so
-%{_datadir}/manual/mod/mod_info.html.en
%files mod_proxy
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_proxy.conf
%attr(755,root,root) %{_libexecdir}/mod_proxy*.so
-%doc %{_datadir}/manual/mod/mod_proxy*.html.en
-%attr(770,root,http) /var/cache/apache
%files mod_rewrite
%defattr(644,root,root,755)
%attr(755,root,root) %{_libexecdir}/mod_rewrite.so
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_rewrite.conf
-%{_datadir}/manual/mod/mod_rewrite.html.en
-%{_datadir}/manual/images/mod_rewrite*
%if %{with ssl}
%files mod_ssl
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ssl/server.*
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_ssl.conf
%attr(755,root,root) %{_libexecdir}/mod_ssl.so
-%{_datadir}/manual/ssl
-%{_datadir}/manual/mod/mod_ssl.html.en
%endif
%files mod_status
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_status.conf
%attr(755,root,root) %{_libexecdir}/mod_status.so
-%{_datadir}/manual/mod/mod_status.html.en
%files mod_usertrack
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_usertrack.conf
%attr(755,root,root) %{_libexecdir}/mod_usertrack.so
-%{_datadir}/manual/mod/mod_usertrack.html.en
%files mod_unique_id
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_unique_id.conf
%attr(755,root,root) %{_libexecdir}/mod_unique_id.so
-%{_datadir}/manual/mod/mod_unique_id.html.en
%files mod_vhost_alias
%defattr(644,root,root,755)
%attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so
-%{_datadir}/manual/mod/mod_vhost_alias.html.en
-%{_datadir}/manual/vhosts
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_vhost_alias.conf
+
+%files -n htpasswd-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/htpasswd
+%{_sbindir}/htpasswd
+%{_mandir}/man1/htpasswd.1*