Release 2 (by relup.sh)

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index e4bf00b1810717674bf6fefe7630bb647941054b..cc975127b7f4f90b15196c6100f1fa0f77e905e4 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -9,6 +9,7 @@
 # - mod_auth_digest and mod_auth_basic R: apache(authn) ?
 # - drop mod_case_filter* or find summary and description for them
 # - FYI: http://wiki.apache.org/httpd/InternalDummyConnection
+# - consider modules: mod_authnz_fcgi, mod_socache_dc (distcache bcond)
 
 # Conditional build:
 %bcond_without ssl             # build without SSL support
@@ -33,12 +34,12 @@ Summary(pt_BR.UTF-8):       Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):     Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
-Version:       2.4.46
-Release:       3
+Version:       2.4.55
+Release:       2
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5: 7d661ea5e736dac5e2761d9f49fe8361
+# Source0-md5: b6a8b9d8741db43cf5b4dd8e9bdb0ce7
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -78,6 +79,7 @@ Patch2:               %{name}-suexec.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-apr.patch
 Patch7:                %{name}-syslibs.patch
+Patch8:         http2-500.patch
 
 Patch10:       httpd-2.0.46-dav401dest.patch
 Patch14:       httpd-2.0.48-corelimit.patch
@@ -97,6 +99,7 @@ BuildRequires:        apr-devel >= %{apr_ver}
 BuildRequires: apr-util-devel >= %{apr_util_ver}
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: curl-devel
 %{?with_distcache:BuildRequires:       distcache-devel}
 BuildRequires: jansson-devel
 BuildRequires: libbrotli-devel >= 0.6.0
@@ -211,13 +214,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
@@ -270,9 +268,7 @@ Summary(pl.UTF-8):  Pliki Apache index.html*
 Group:         Documentation
 Requires:      %{name}-base = %{version}-%{release}
 Obsoletes:     indexhtml
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description index
 Apache index.html* files.
@@ -289,9 +285,7 @@ Requires:   %{name}-mod_alias = %{version}-%{release}
 Requires:      %{name}-mod_dir = %{version}-%{release}
 Requires:      %{name}-mod_negotiation = %{version}-%{release}
 Requires:      %{name}-mod_setenvif = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description doc
 Apache manual.
@@ -309,9 +303,7 @@ Requires:   %{name}-mod_alias = %{version}-%{release}
 Requires:      %{name}-mod_authz_host = %{version}-%{release}
 Requires:      %{name}-mod_include = %{version}-%{release}
 Requires:      %{name}-mod_negotiation = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description errordocs
 Multi-language error messages.
@@ -329,8 +321,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.
@@ -634,7 +626,6 @@ URL:                http://httpd.apache.org/docs/2.4/mod/mod_authn_core.html
 Requires:      %{name}-base = %{version}-%{release}
 Provides:      apache(mod_authn_core) = %{version}-%{release}
 Provides:      apache(mod_authn_default) = %{version}-%{release}
-Obsoletes:     apache(mod_authn_alias)
 Obsoletes:     apache-mod_authn_default < %{version}-%{release}
 
 %description mod_authn_core
@@ -1432,7 +1423,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.
@@ -1578,7 +1569,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
@@ -2685,9 +2676,7 @@ Summary(pl.UTF-8):        Programy testowe/przykładowe cgi
 Group:         Networking/Utilities
 Requires:      %{name}-base = %{version}-%{release}
 Requires:      filesystem >= 2.0-1
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description cgi_test
 Two cgi test/demo programs: test-cgi and print-env.
@@ -2704,6 +2693,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch4 -p1
 
 %patch7 -p1
+%patch8 -p1
 
 %patch10 -p1
 
@@ -2851,11 +2841,11 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,systemd/system
 %{__sed} -i -re '/^(CC|CPP|CXX)/ s/ccache //' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/config_vars.mk
 
 cp -p %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/httpd.service
-ln -s %{systemdunitdir}/httpd.service $RPM_BUILD_ROOT/etc/systemd/system/httpd.service
-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%{systemdunitdir}/httpd.service $RPM_BUILD_ROOT/etc/systemd/system/httpd.service
+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
@@ -3017,7 +3007,7 @@ s/^.*\.\(pt-br\)/%%lang(pt_BR) &/
 cd $cur
 
 # htpasswd goes to %{_bindir}
-ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
+ln -sfr $RPM_BUILD_ROOT%{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
 
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/apxs
 
@@ -3078,14 +3068,15 @@ if [ "$1" = "0" ]; then
 fi
 %systemd_reload
 
-%triggerpostun base -- %{name}-base < 2.2.22-2
+%triggerpostun base -- %{name}-base < 2.4.0
+#  < 2.2.22-2
 . /etc/sysconfig/httpd
 if [ -z "$HTTPD_CONF" ]; then
        echo 'HTTPD_CONF="/etc/httpd/apache.conf"' >> /etc/sysconfig/httpd
 fi
 %systemd_trigger httpd.service
 
-%triggerpostun base -- %{name}-base < 2.4.0
+# < 2.4.0
 cp -f /etc/httpd/apache.conf{,.rpmsave}
 sed -i -e '
        /^DefaultType/d
@@ -3317,7 +3308,7 @@ fi
 %dir %{_datadir}/cgi-bin
 %dir %{_datadir}/html
 %dir %{_datadir}/vhosts
-# do not adapter here, %{_datadir} != /usr/share here
+# do not adapter here, %%{_datadir} != /usr/share here
 %{_datadir}/icons
 %attr(755,root,root) %{_libexecdir}/mod_mpm_event.so
 %attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so