- added -bug_33382.patch (large memory consumption)

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 98873cd57dd8ea2f3bacf921526d5119c77dc052..df1c0d3b906c579ddd8bd685b45c230c3cfae09f 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -14,10 +14,12 @@
 # - --with-suexec-uidmin=500 or =1000 ?
 # - 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             # 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
@@ -31,16 +33,18 @@ Summary(pt_BR):     Servidor HTTPD para prover servi
 Summary(ru):   óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
-Version:       2.0.52
-Release:       8
+Version:       2.0.53
+Release:       3.3
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: eba528fa8613dc5bfb0615a69c11f053
+# 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
@@ -82,6 +86,10 @@ 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:1.0.0
@@ -93,6 +101,7 @@ 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}
+%{?with_external_pcre:BuildRequires:   pcre-devel}
 BuildRequires: perl-devel >= 1:5.6
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.159
@@ -114,6 +123,21 @@ Requires:  %{name}-apxs = %{version}-%{release}
 Requires:      mailcap
 Requires:      psmisc >= 20.1
 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)
@@ -139,7 +163,7 @@ erh
 %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.
@@ -171,7 +195,7 @@ sunucusudur.
 %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
@@ -265,6 +289,7 @@ desenvolver m
 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
@@ -280,7 +305,9 @@ Ten modu
 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
@@ -294,12 +321,13 @@ u
 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
@@ -317,6 +345,7 @@ adresu pocztowego u
 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}
 
@@ -331,6 +360,7 @@ 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
@@ -347,6 +377,7 @@ Summary:    Apache user authentication module using MD5 Digest Authentication
 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
@@ -361,6 +392,7 @@ Authentication.
 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
@@ -374,6 +406,7 @@ Ten pakiet dostarcza modu
 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
@@ -395,6 +428,7 @@ proxy. Do
 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
@@ -407,6 +441,7 @@ Uruchamianie zewn
 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
@@ -419,6 +454,7 @@ Translacja lub przekodowywanie znak
 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
@@ -437,7 +473,9 @@ zdalnym serwerze WWW.
 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.
@@ -449,6 +487,7 @@ Modu
 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
@@ -463,6 +502,7 @@ katalogu.
 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
@@ -478,6 +518,7 @@ wysy
 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
@@ -492,6 +533,7 @@ Modu
 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
@@ -507,6 +549,7 @@ zainstalowanych modu
 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
@@ -519,6 +562,7 @@ Modu
 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
@@ -536,6 +580,7 @@ HTTP/1.0 i HTTP/1.1.
 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
@@ -551,6 +596,7 @@ Summary(pl):        Modu
 Summary(ru):   íÏÄÕÌØ SSL/TLS ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
 Group:         Networking/Daemons
 Epoch:         1
+Provides:      apache(mod_ssl) = %{version}-%{release}
 Requires:      %{name} = %{version}-%{release}
 
 %description mod_ssl
@@ -571,6 +617,7 @@ Security).
 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
@@ -588,6 +635,7 @@ pracy serwera apache (w postaci strony HTML).
 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
@@ -602,6 +650,7 @@ Modu
 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
@@ -616,6 +665,7 @@ wirtualnych.
 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
@@ -637,6 +687,7 @@ 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
@@ -655,6 +706,7 @@ Summary:    Apache module: caches a static list of files in memory
 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
@@ -663,6 +715,26 @@ Caches a static list of files in memory.
 %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 p³askich plików s³u¿±cych
+do przechowywania nazw u¿ytkowników i hase³ do uwierzytelnienia basic
+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
@@ -687,6 +759,9 @@ Modu
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%{?with_external_pcre:%patch25 -p2}
+%patch26 -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
@@ -773,7 +848,8 @@ install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
        --with-suexec-gidmin=500 \
        --with-suexec-umask=077 \
        --with-apr=%{_bindir}/apr-1-config \
-       --with-apr-util=%{_bindir}/apu-1-config
+       --with-apr-util=%{_bindir}/apu-1-config \
+       %{?_with_external_pcre:--with-external-pcre}
 %{__make}
 ./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside
 
@@ -887,6 +963,10 @@ 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
 
@@ -916,7 +996,7 @@ touch /var/log/httpd/{access,error,agent,referer}_log
 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
@@ -934,7 +1014,7 @@ if [ "$1" = "0" ]; then
        %groupremove http
 fi
 
-%triggerpostun  -- %{name} <= 2.0.50-6
+%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:"
@@ -945,7 +1025,7 @@ echo
 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
@@ -959,7 +1039,7 @@ fi
 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
@@ -973,7 +1053,7 @@ fi
 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
@@ -987,7 +1067,7 @@ fi
 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
@@ -1001,7 +1081,7 @@ fi
 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_autoindex
@@ -1015,7 +1095,7 @@ fi
 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
@@ -1029,7 +1109,7 @@ fi
 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
@@ -1043,7 +1123,7 @@ fi
 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
@@ -1057,7 +1137,7 @@ fi
 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
@@ -1071,7 +1151,7 @@ fi
 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
@@ -1085,7 +1165,7 @@ fi
 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
@@ -1099,7 +1179,7 @@ fi
 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
@@ -1113,7 +1193,7 @@ fi
 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
@@ -1127,7 +1207,7 @@ fi
 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
@@ -1141,7 +1221,7 @@ fi
 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
@@ -1155,7 +1235,7 @@ fi
 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
@@ -1169,7 +1249,7 @@ fi
 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
@@ -1183,7 +1263,7 @@ fi
 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
@@ -1197,7 +1277,7 @@ fi
 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
@@ -1211,7 +1291,7 @@ fi
 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
@@ -1225,7 +1305,7 @@ fi
 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
@@ -1239,7 +1319,7 @@ fi
 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
@@ -1253,7 +1333,7 @@ fi
 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
@@ -1267,7 +1347,7 @@ fi
 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
@@ -1481,8 +1561,6 @@ fi
 %{_datadir}/manual/mod/mod_rewrite.html.en
 %{_datadir}/manual/images/mod_rewrite*
 %dir %{_datadir}/manual/ssl
-%{_datadir}/manual/ssl/*.gif
-%{_datadir}/manual/ssl/*.png
 %{_datadir}/manual/ssl/*.html.en
 %lang(ja) %{_datadir}/manual/ssl/*.html.ja*
 %{_datadir}/manual/mod/mod_ssl.html.en
@@ -1542,8 +1620,6 @@ fi
 %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
-%{_mandir}/man1/htpasswd.1*
 
 %files mod_auth_anon
 %defattr(644,root,root,755)
@@ -1677,3 +1753,9 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/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*