- merged PLD changes/fixes

diff --git a/apache-common.conf b/apache-common.conf
index 085c5e7ef242e475e2b4aa970cbc154e200d5737..c354dee9f18ecae47c33a881460b23e577178f10 100644 (file)
--- a/apache-common.conf
+++ b/apache-common.conf
@@ -19,8 +19,10 @@ DocumentRoot "/home/services/httpd/html"
                Require all denied
        </IfModule>
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order deny,allow
                Deny from all
+            </IfModule>
        </IfModule>
 </Directory>
 
@@ -33,20 +35,24 @@ DocumentRoot "/home/services/httpd/html"
                Require all denied
        </IfModule>
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order deny,allow
                Deny from all
+            </IfModule>
        </IfModule>
 </FilesMatch>
 
 # Prevent access to:
 # - version control directories
-<DirectoryMatch "/(\.(svn|git|hg|bzr)|CVS)/?">
+<DirectoryMatch "/(\.(svn|git|hg|bzr)|CVS|DS_Store)/?">
        <IfModule mod_authz_host.c>
                Require all denied
        </IfModule>
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order deny,allow
                Deny from all
+            </IfModule>
        </IfModule>
 </DirectoryMatch>
 
@@ -63,10 +69,10 @@ DocumentRoot "/home/services/httpd/html"
        # doesn't give it to you.
        #
        # The Options directive is both complicated and important.  Please see
-       # http://httpd.apache.org/docs/2.2/mod/core.html#options
+       # https://httpd.apache.org/docs/2.4/mod/core.html#options
        # for more information.
        #
-       Options Indexes FollowSymLinks
+       Options FollowSymLinks
 
        #
        # AllowOverride controls what directives may be placed in .htaccess files.
@@ -82,8 +88,10 @@ DocumentRoot "/home/services/httpd/html"
                Require all granted
        </IfModule>
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order allow,deny
                Allow from all
+            </IfModule>
        </IfModule>
 
 </Directory>

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 2c3ddd6b2177a3798fa9373d64edf3e3572436af..6916b9b8eaf89893ac86ade72883504660fd787e 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -121,8 +121,10 @@ IncludeOptional webapps.d/*.conf
                        Require all granted
                </IfModule>
                <IfModule mod_access_compat.c>
+                    <IfModule !mod_authz_host.c>
                        Order allow,deny
                        Allow from all
+                    </IfModule>
                </IfModule>
        </Directory>
 </IfModule>

diff --git a/apache-manual.conf b/apache-manual.conf
index 1ccd95f65fdbea29247e32f9fc6ebf88e22f20ac..056afc4dfa9e77c1bfd66a30531eed527345fd21 100644 (file)
--- a/apache-manual.conf
+++ b/apache-manual.conf
@@ -1,8 +1,7 @@
-#
 # Provide access to the documentation on your server as
 #  http://yourserver.example.com/manual/
 # The documentation is always available at
-#  http://httpd.apache.org/docs/2.2/
+#  https://httpd.apache.org/docs/2.4/
 #
 # Required modules: mod_alias, mod_setenvif, mod_negotiation
 #                   mod_setenvif, mod_negotiation
@@ -13,10 +12,14 @@ AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/hom
 <Directory "/home/services/httpd/manual">
        Options Indexes
        AllowOverride None
-       Require all granted
+        <IfModule mod_authz_host.c>
+           Require all granted
+        </IfModule>
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order allow,deny
                Allow from all
+            </IfModule>
        </IfModule>
 
        <Files *.html>

diff --git a/apache-mod_autoindex.conf b/apache-mod_autoindex.conf
index 165fde4a5ea8bfba0f499efc4a12d046f2045fa8..f25800d3130b3cbd1cc8e9250b618324ecf3f682 100644 (file)
--- a/apache-mod_autoindex.conf
+++ b/apache-mod_autoindex.conf
@@ -28,8 +28,10 @@ Alias /icons/ "/home/services/httpd/icons/"
                Require all granted
        </IfModule>
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order allow,deny
                Allow from all
+            </IfModule>
        </IfModule>
 </Directory>
 

diff --git a/apache-mod_info.conf b/apache-mod_info.conf
index 4dca4805d224afdd37614ad65620524dfef93021..7e176fd7dcb3e42d5f13cbf64eba1549ecfb9e4d 100644 (file)
--- a/apache-mod_info.conf
+++ b/apache-mod_info.conf
@@ -17,9 +17,11 @@ LoadModule info_module               modules/mod_info.so
        # Require ip 127
        Require local
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order deny,allow
                Deny from all
                Allow from 127.0.0.1
+            </IfModule>
        </IfModule>
 </Location>
 

diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf
index 00f9a57347bbff744e3495f670a042925b54757e..5dcd0dd648a8a0f56d3663c53fad267544410f86 100644 (file)
--- a/apache-mod_proxy.conf
+++ b/apache-mod_proxy.conf
@@ -32,9 +32,11 @@ ProxyRequests On
        Require all denied
 #      Require host .your-domain.com
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order deny,allow
                Deny from all
 #              Allow from .your-domain.com
+            </IfModule>
        </IfModule>
 </Proxy>
 

diff --git a/apache-mod_ssl.conf b/apache-mod_ssl.conf
index cf09e1dd3c98b442bb088b152084d998121041a7..c2d27c87a4cccf0c94eff94a868d14584935f4fb 100644 (file)
--- a/apache-mod_ssl.conf
+++ b/apache-mod_ssl.conf
@@ -3,7 +3,7 @@ LoadModule ssl_module   modules/mod_ssl.so
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
 # serve pages over an https connection. For detailing information about these
-# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html>
+# directives see <https://httpd.apache.org/docs/2.4/mod/mod_ssl.html>
 
 <IfModule mod_ssl.c>
 #

diff --git a/apache-mod_status.conf b/apache-mod_status.conf
index 6477a232966684203ebd6772a6030b24b6c9a917..7028ef4a7f639a4465943690a8c34424d17b1862 100644 (file)
--- a/apache-mod_status.conf
+++ b/apache-mod_status.conf
@@ -18,9 +18,11 @@ LoadModule status_module             modules/mod_status.so
        # Require ip 127
        Require local
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order deny,allow
                Deny from all
                Allow from 127.0.0.1
+            </IfModule>
        </IfModule>
 </Location>
 

diff --git a/apache-mod_userdir.conf b/apache-mod_userdir.conf
index 534367a5cb354b6920f89da4b63ad957a423cabf..c02bb8854838e88002ed7b3ee3eda86b9eda581e 100644 (file)
--- a/apache-mod_userdir.conf
+++ b/apache-mod_userdir.conf
@@ -18,19 +18,23 @@ UserDir public_html
 #
 <Directory /home/users/*/public_html>
        AllowOverride FileInfo AuthConfig Limit Indexes
-       Options Indexes SymLinksIfOwnerMatch IncludesNoExec
+       Options SymLinksIfOwnerMatch
        <Limit GET POST OPTIONS>
                Require all granted
                <IfModule mod_access_compat.c>
+                    <IfModule !mod_authz_host.c>
                        Order allow,deny
                        Allow from all
+                    </IfModule>
                </IfModule>
        </Limit>
        <LimitExcept GET POST OPTIONS>
                Require all denied
                <IfModule mod_access_compat.c>
+                    <IfModule !mod_authz_host.c>
                        Order deny,allow
                        Deny from all
+                    </IfModule>
                </IfModule>
        </LimitExcept>
        #<IfModule mod_php.c>

diff --git a/apache-multilang-errordoc.conf b/apache-multilang-errordoc.conf
index b4bf2a350a605b9e948f80d85a5bd7bda246fb0d..e027032c5e9a35b49b92c3725ec1f73739dd850a 100644 (file)
--- a/apache-multilang-errordoc.conf
+++ b/apache-multilang-errordoc.conf
@@ -28,8 +28,10 @@ Alias /error/ "/home/services/httpd/error/"
        AddHandler type-map var
        Require all granted
        <IfModule mod_access_compat.c>
+            <IfModule !mod_authz_host.c>
                Order allow,deny
                Allow from all
+            </IfModule>
        </IfModule>
        LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
        ForceLanguagePriority Prefer Fallback

diff --git a/apache-server.crt b/apache-server.crt
index 62d81d88d36e4e2cac477a1225f6c3d085a2ee6b..7bbf4dd576f83a343cf5d2c636f95e3fd0eec320 100644 (file)
--- a/apache-server.crt
+++ b/apache-server.crt
@@ -1,17 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIICFjCCAX+gAwIBAgIBATANBgkqhkiG9w0BAQQFADBQMRowGAYDVQQKExFEdW1t
-eSBjZXJ0aWZpY2F0ZTEbMBkGA1UECxMSSGFzIHRvIGJlIHJlcGxhY2VkMRUwEwYD
-VQQDEwx3d3cuYWR2eC5jb20wHhcNMDEwNDA5MDg0NjUyWhcNMDIwNDA5MDg0NjUy
-WjBSMSEwHwYDVQQKExhBZHZhbmNlZCBFeHRyYW5ldCBTZXJ2ZXIxGTAXBgNVBAsT
-EFRlc3QgQ2VydGlmaWNhdGUxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAoRtceA5d+grmrN76yHT4TQvbLQqvTsq2fFafNBT/
-DdSh05okHdTldu8kgTvBzpLPuOQvSwy2SzQLwF6nmzWdfY21U33NARp46i/QWD3V
-rgIXuhXtToTnkEE6/OGq5KeELgF/EKSXLXkDydyHg9mFlh/J/kKtjv3wtIHceOGn
-E18CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCShXMRerTzEJMkIdCDD+ZkOetE65j0
-mkgAGT4etmSiUmNWXy/P26zh1P51YeS4TZFpXxgONVK9PIywhhkVNB8JFdXYKbxW
-0h0caVoEHwnfkSERcBVffxaZEDtWa95nxD8pHiZ+++PPOV1P29Ta2j23MWq2JitY
-U2Y59HXWwglSaQ==
+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
+Gr15HUY4A6V4E5fvVw==
 -----END CERTIFICATE-----
-
-
-#DUMMY
\ No newline at end of file

diff --git a/apache-server.key b/apache-server.key
index 08c373cc9f258a0b201abbc9763b82ee141ddced..d00da4b0ff4aa64c65c6dc9e3c9381226952914b 100644 (file)
--- a/apache-server.key
+++ b/apache-server.key
@@ -1,18 +1,52 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQChG1x4Dl36Cuas3vrIdPhNC9stCq9OyrZ8Vp80FP8N1KHTmiQd
-1OV27ySBO8HOks+45C9LDLZLNAvAXqebNZ19jbVTfc0BGnjqL9BYPdWuAhe6Fe1O
-hOeQQTr84arkp4QuAX8QpJcteQPJ3IeD2YWWH8n+Qq2O/fC0gdx44acTXwIDAQAB
-AoGASjM323OChO8QXv4zsq9szM9xGsWZCEkE0y9yE6K39b7A6ZxMlhC/vo9V2M+U
-63dihF1UCtTIAMrvvqHZv/pplfbUJDAeNm38BBlA/ZQL8iV9qxNrBEfBkLi5AtcR
-vJq5NitAE+vpcn00QNs7EKflRwi5arQOBGqS9c3uPimtOcECQQDQc9onX9kZuzz6
-69GQYkkj3dkZx6lCtDDexTWkM1yXGVSjvFA7fZOKJRNkGgc6iwbnTsEJfaEC9j7r
-AkF7/92dAkEAxdrbwKjx4/OZnve82O4VRGkZFo6c47QDXCKhlRdJzrBSCNOnRaLx
-vjtYXbqq8BPgdGO72pj1TaAlp1+kxdYiKwJBALBhtzAl/C+3rUusirCfWcANkgws
-U95rVgbJ3C/KfggkmOfLCiCsi1ETOiszkvZIeVjz3IdJVBqLfoWgbQSdZkkCQQDF
-WpBWdW6KnSL/0Uda7ujhyx+OQ4S1EItFbPnV+FvTwkahrVUtfeI6iYGURK1bOchq
-8EyiOG5/Fp5YfGukNvrvAkBT5AAvfk6nFHshdHDhTZs+5TE24g0aTtMEQc82cobd
-JG5vFxybo3z1l1QU4/pG3jP847/6HtZCxZ/J0xLATJml
------END RSA PRIVATE KEY-----
-
-
-#DUMMY
\ No newline at end of file
+-----BEGIN PRIVATE KEY-----
+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
+SMNgvxbVInbT7wFAlEK3i+ol1nhOOA==
+-----END PRIVATE KEY-----

diff --git a/apache.spec b/apache.spec
index 7ac2f0b27ca29622a70596a596fc228cd37cb88d..cadc3b8a2d51390c188efbef6dc51a7299848904 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -138,9 +138,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/httpd
 %define                _includedir     %{_prefix}/include/apache
-%define                _datadir        /home/services/httpd
 %define                _libexecdir     %{_libdir}/apache
 %define                _cgibindir      %{_prefix}/lib/cgi-bin/%{name}
+%define                docroot         /home/services/httpd
 
 %description
 Apache is a powerful, full-featured, efficient and freely-available
@@ -205,13 +205,8 @@ Provides:  apache(modules-api) = %{_apache_modules_api}
 Provides:      group(http)
 Provides:      user(http)
 Provides:      webserver = apache
-Obsoletes:     apache-extra
-Obsoletes:     apache6
-# packaged by mistake. really sample code
-Obsoletes:     apache-mod_optional_fn_export
-Obsoletes:     apache-mod_optional_fn_import
-Obsoletes:     apache-mod_optional_fn_import
-Obsoletes:     apache-mod_optional_hook_import
+Obsoletes:     apache-extra < 1.3.1
+Obsoletes:     apache6 < 1.3.4
 Conflicts:     apache < 2.2.0
 # mod_wsgi >= 3.4 is required for apache 2.4
 Conflicts:     apache-mod_wsgi < 3.4
@@ -323,8 +318,8 @@ Summary(ru.UTF-8):  Средства разработки модулей для 
 Group:         Networking/Utilities
 Requires:      apr-util-devel >= %{apr_util_ver}
 Requires:      libtool
-Obsoletes:     apache-apxs
-Obsoletes:     apache-static
+Obsoletes:     apache-apxs < 2.2.6-3
+Obsoletes:     apache-static < 2.0.47-1
 
 %description devel
 The apache-devel package contains header files for Apache.
@@ -1425,7 +1420,7 @@ Group:            Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_file_cache.html
 Requires:      %{name}-base = %{version}-%{release}
 Provides:      apache(mod_file_cache) = %{version}-%{release}
-Obsoletes:     apache-mmap_static
+Obsoletes:     apache-mod_mmap_static < 2
 
 %description mod_file_cache
 Caches a static list of files in memory.
@@ -1571,7 +1566,7 @@ URL:              http://httpd.apache.org/docs/2.4/mod/mod_imagemap.html
 Requires:      %{name}-base = %{version}-%{release}
 Provides:      apache(mod_imagemap) = %{version}-%{release}
 Provides:      apache-mod_imap
-Obsoletes:     apache-mod_imap
+Obsoletes:     apache-mod_imap < 2.2.0-1
 
 %description mod_imagemap
 This module processes .map files, thereby replacing the functionality
@@ -2715,6 +2710,7 @@ CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
 install -d build; cd build
 %define configuredir ..
 %configure \
+       --datadir=%{docroot} \
        --enable-layout=TLD \
        --disable-systemd \
        --disable-v4-mapped \
@@ -2790,7 +2786,7 @@ install -d build; cd build
        --with-program-name=httpd \
        --with-suexec-bin=%{_sbindir}/suexec \
        --with-suexec-caller=http \
-       --with-suexec-docroot=%{_datadir} \
+       --with-suexec-docroot=%{docroot} \
        --with-suexec-logfile=/var/log/httpd/suexec_log \
        --with-suexec-uidmin=500 \
        --with-suexec-gidmin=500 \
@@ -2805,7 +2801,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        $RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
        $RPM_BUILD_ROOT%{_var}/lib/httpd/md \
        $RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
-       $RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts}
+       $RPM_BUILD_ROOT%{docroot}/{cgi-bin,vhosts}
 
 %{__make} -j 1 -C build install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -2813,10 +2809,10 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 # clean "ccache" prefix. confuses other build systems (like php)
 %{__sed} -i -re '/^(CC|CPP|CXX)/ s/ccache //' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/config_vars.mk
 
-ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
-ln -s %{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run
-ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs
-ln -s %{_var}/lib/httpd/md $RPM_BUILD_ROOT%{_sysconfdir}/md
+ln -sr $RPM_BUILD_ROOT%{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
+ln -sr $RPM_BUILD_ROOT%{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run
+ln -sr $RPM_BUILD_ROOT%{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs
+ln -sr $RPM_BUILD_ROOT%{_var}/lib/httpd/md $RPM_BUILD_ROOT%{_sysconfdir}/md
 
 # we have own apache.conf
 rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -2864,45 +2860,111 @@ cp -a %{SOURCE33} $CFG/60_mod_md.conf
 
 cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
 
+modules="
+       access_compat
+       actions
+       alias
+       allowmethods
+       asis
+       auth_basic
+       auth_digest
+       auth_form
+       authn_anon
+       authn_core
+       authn_dbd
+       authn_dbm
+       authn_file
+       authn_socache
+       authnz_ldap
+       authz_core
+       authz_dbd
+       authz_dbm
+       authz_groupfile
+       authz_owner
+       authz_user
+       brotli
+       %{?with_bucketeer:bucketeer}
+       buffer
+       case_filter_in
+       case_filter
+       cern_meta
+       cgi
+       charset_lite
+       data
+       dbd
+       dialup
+       dumpio
+       echo
+       env
+       expires
+       ext_filter
+       file_cache
+       filter
+       headers
+       heartbeat
+       heartmonitor
+       ident
+       imagemap
+       include
+       lbmethod_bybusyness
+       lbmethod_byrequests
+       lbmethod_bytraffic
+       lbmethod_heartbeat
+       ldap
+       log_debug
+       log_forensic
+       logio
+       lua
+       macro
+       md
+       negotiation
+       ratelimit
+       reflector
+       remoteip
+       reqtimeout
+       request
+       rewrite
+       sed
+       session_cookie
+       session_crypto
+       session_dbd
+       session
+       setenvif
+       slotmem_plain
+       slotmem_shm
+       socache_dbm
+       socache_memcache
+       socache_redis
+       socache_shmcb
+       speling
+       substitute
+       unique_id
+       usertrack
+       version
+       watchdog
+       xml2enc
+"
+
 LoadModule() {
        local index=$1 module=$2 conffile
        conffile=${3:-$module}
        echo "LoadModule ${module}_module modules/mod_$module.so" > $CFG/${index}_mod_${conffile}.conf
 }
 
-for module in access_compat actions alias allowmethods asis auth_basic \
-       auth_digest auth_form authn_anon authn_core authn_dbd authn_dbm \
-       authn_file authn_socache authnz_ldap authz_core authz_dbd \
-       authz_dbm authz_groupfile authz_owner authz_user brotli \
-       %{?with_bucketeer:bucketeer} buffer \
-       case_filter_in case_filter cern_meta cgi charset_lite \
-       data dbd dialup dumpio \
-       echo env expires ext_filter \
-       file_cache filter \
-       headers heartbeat heartmonitor \
-       ident imagemap include \
-       lbmethod_bybusyness lbmethod_byrequests lbmethod_bytraffic \
-       lbmethod_heartbeat ldap log_debug log_forensic logio lua \
-       macro md negotiation \
-       ratelimit reflector remoteip reqtimeout request rewrite \
-       sed session_cookie session_crypto session_dbd session setenvif \
-       slotmem_plain slotmem_shm socache_dbm socache_memcache \
-       socache_redis socache_shmcb speling substitute \
-       unique_id usertrack version watchdog xml2enc; do
-
+for module in $modules; do
        LoadModule 00 $module
 done
 
 # anything in style dir not ending with .css is trash
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
-find $RPM_BUILD_ROOT%{_datadir}/manual/style -type f ! -name '*.css' -print0 | xargs -0r rm -f
+%{__rm} -r $RPM_BUILD_ROOT%{docroot}/manual/style/{lang,latex,xsl}
+find $RPM_BUILD_ROOT%{docroot}/manual/style -type f ! -name '*.css' -print0 | xargs -0r rm -f
 
 # find manual files
 > manual.files
 cur=$(pwd)
 cd $RPM_BUILD_ROOT
-find ./%{_datadir}/manual -type d -printf "%%%%dir %{_datadir}/manual/%%P\n" >> "$cur/manual.files"
-find ./%{_datadir}/manual -type f -printf "%{_datadir}/manual/%%P\n" | sed -e '
+find ./%{docroot}/manual -type d -printf "%%%%dir %{docroot}/manual/%%P\n" >> "$cur/manual.files"
+find ./%{docroot}/manual -type f -printf "%{docroot}/manual/%%P\n" | sed -e '
 s/^.*\.\(de\|es\|fr\|ja\|ko\|ru\)\(\..*\)\?/%%lang(\1) &/
 s/^.*\.\(pt-br\)/%%lang(pt_BR) &/
 ' >> "$cur/manual.files"
@@ -2928,6 +2990,7 @@ ln -sf suexec $RPM_BUILD_ROOT%{_sbindir}/suexec.fcgi
 %{__rm} $RPM_BUILD_ROOT%{_libexecdir}/*.exp
 %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 %{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/{extra,original}
+%{__rm} $RPM_BUILD_ROOT%{docroot}/icons/README*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -3183,13 +3246,12 @@ fi
 %attr(2750,root,logs) %dir /var/log/archive/httpd
 %attr(640,root,logs) %ghost /var/log/httpd/*
 
-%dir %{_datadir}
+%dir %{docroot}
 
-%dir %{_datadir}/cgi-bin
-%dir %{_datadir}/html
-%dir %{_datadir}/vhosts
-# do not adapter here, %%{_datadir} != /usr/share here
-%{_datadir}/icons
+%dir %{docroot}/cgi-bin
+%dir %{docroot}/html
+%dir %{docroot}/vhosts
+%{docroot}/icons
 %attr(755,root,root) %{_libexecdir}/mod_mpm_event.so
 %attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so
 %attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so
@@ -3202,7 +3264,7 @@ fi
 %files errordocs
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_errordocs.conf
-%{_datadir}/error
+%{docroot}/error
 
 %files suexec
 %defattr(644,root,root,755)
@@ -3214,7 +3276,7 @@ fi
 
 %files index
 %defattr(644,root,root,755)
-%config(noreplace,missingok) %{_datadir}/html/index.html*
+%config(noreplace,missingok) %{docroot}/html/index.html*
 
 %files tools
 %defattr(644,root,root,755)