Kolab Groupware OBS

Changes of Revision 4

httpd.spec Changed

@@ -33,8 +33,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.4.20
-Release: 1%{?dist}
+Version: 2.4.25
+Release: 6.1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -112,7 +112,7 @@
 %endif
 Provides: webserver
 Provides: mod_dav = %{version}-%{release}
-Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{mmn}%{__isa_name}%{__isa_bits}
+Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmn}%{__isa_name}%{__isa_bits}
 Requires: httpd-tools = %{version}-%{release}
 Requires: httpd-filesystem = %{version}-%{release}
 Requires(pre): httpd-filesystem
@@ -203,7 +203,7 @@
 BuildRequires: openssl-devel
 Requires(post): openssl >= 1:1.0.1e, /bin/cat, /bin/hostname
 Requires(pre): httpd
-Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}%{__isa_name}%{__isa_bits}
 Obsoletes: stronghold-mod_ssl
 
 %description -n mod_ssl
@@ -214,7 +214,7 @@
 %package -n mod_proxy_html
 Group: System Environment/Daemons
 Summary: HTML and XML content filters for the Apache HTTP Server
-Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}%{__isa_name}%{__isa_bits}
 BuildRequires: libxml2-devel
 Epoch: 1
 Obsoletes: mod_proxy_html < 1:2.4.1-2
@@ -226,7 +226,7 @@
 %package -n mod_ldap
 Group: System Environment/Daemons
 Summary: LDAP authentication modules for the Apache HTTP Server
-Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}%{__isa_name}%{__isa_bits}
 Requires: apr-util-ldap >= 1.5.3
 
 %description -n mod_ldap
@@ -236,7 +236,7 @@
 %package -n mod_session
 Group: System Environment/Daemons
 Summary: Session interface for the Apache HTTP Server
-Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}%{__isa_name}%{__isa_bits}
 
 %description -n mod_session
 The mod_session module and associated backends provide an abstract
@@ -270,7 +270,8 @@
 # This sets an incompatible default
 #%patch35 -p1 -b .sslciphdefault
 
-%patch55 -p1 -b .malformedhost
+# Already applied
+#%patch55 -p1 -b .malformedhost
 %patch56 -p1 -b .uniqueid
 %patch57 -p1 -b .sigint
 %patch58 -p1 -b .debugcrash
@@ -289,7 +290,7 @@
    exit 1
 fi
 
-: Building with MMN %{mmn}, MMN-ISA %{mmnisa} and vendor string '%{vstring}'
+: Building with MMN %{mmn}, MMN-ISA %{mmn}%{__isa_name}%{__isa_bits} and vendor string '%{vstring}'
 
 %build
 # forcibly prevent use of bundled apr, apr-util, pcre
@@ -448,7 +449,7 @@
          $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd/ssl
 
 # Make the MMN accessible to module packages
-echo %{mmnisa} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
+echo %{mmn}%{__isa_name}%{__isa_bits} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
 %if 0%{?fedora} > 19
 mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
 cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd <<EOF
@@ -456,7 +457,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.httpd <<EOF
 %endif
-%%_httpd_mmn %{mmnisa}
+%%_httpd_mmn %{mmn}%{__isa_name}%{__isa_bits}
 %%_httpd_apxs %%{_bindir}/apxs
 %%_httpd_modconfdir %%{_sysconfdir}/httpd/conf.modules.d
 %%_httpd_confdir %%{_sysconfdir}/httpd/conf.d
@@ -780,6 +781,12 @@
 %endif
 
 %changelog
+* Sun Jan 22 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.25-1
+- Check in version 2.4.25
+
+* Wed Dec 28 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.23-1
+- Check in version 2.4.23
+
 * Mon Jul  4 2016 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.20-1
 - Check in version 2.4.20

httpd-2.4.25.tar.bz2 Added