From caa7c1c7aad454871f1020bb9b50d6bdadb0b8fbf94a604993177d72ad65fe12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?= Date: Mon, 19 Oct 2015 15:09:08 +0000 Subject: [PATCH] Accepting request 338807 from home:pgajdos:apache2 Yeah I know apache_branch as string is awful, we will need to convert it to a number soon. OBS-URL: https://build.opensuse.org/request/show/338807 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_nss?expand=0&rev=16 --- apache2-mod_nss.changes | 6 ++++++ apache2-mod_nss.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apache2-mod_nss.changes b/apache2-mod_nss.changes index c702caa..a3d68c4 100644 --- a/apache2-mod_nss.changes +++ b/apache2-mod_nss.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 14 09:23:18 UTC 2015 - pgajdos@suse.com + +- mod_nss-httpd24.patch applied depending on %{apache_branch} + instead of %{suse_version}, fixes build for sle11 with new apache + ------------------------------------------------------------------- Fri Oct 2 14:35:41 UTC 2015 - pgajdos@suse.com diff --git a/apache2-mod_nss.spec b/apache2-mod_nss.spec index f0af8e6..dc9824a 100644 --- a/apache2-mod_nss.spec +++ b/apache2-mod_nss.spec @@ -128,7 +128,7 @@ security library. %patch28 -p1 -b .reverse_proxy_send_SNI.rpmpatch # keep this last, otherwise we get fuzzyness from above -%if 0%{?suse_version} >= 1300 +%if "%{apache_branch}" != "2.2" %patch9 -p1 -b .http24 %endif